Skip to content

Commit 63ebf4d

Browse files
manuarguenashif
authored andcommitted
Revert "arch: arm: mpu: fix erratum 1013783-B"
This reverts commit 983b1d0. Signed-off-by: Manuel Argüelles <manuel.arguelles@nxp.com>
1 parent db726c4 commit 63ebf4d

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

arch/arm/core/mpu/arm_mpu_regions.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
22
* Copyright (c) 2017 Linaro Limited.
3-
* Copyright 2025 NXP
43
*
54
* SPDX-License-Identifier: Apache-2.0
65
*/
@@ -11,18 +10,8 @@
1110
#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
1211

1312
static const struct arm_mpu_region mpu_regions[] = {
14-
15-
#if defined(CONFIG_CPU_CORTEX_M7) && defined(CONFIG_CPU_HAS_ARM_MPU) && \
16-
defined(CONFIG_CPU_HAS_DCACHE)
17-
/* Erratum 1013783-B (SDEN-1068427): use first region to prevent speculative access
18-
* in entire memory space
19-
*/
20-
MPU_REGION_ENTRY("BACKGROUND",
21-
0,
22-
{REGION_4G | MPU_RASR_XN_Msk | P_NA_U_NA_Msk}),
23-
#endif
24-
2513
#ifdef CONFIG_XIP
14+
/* Region 0 */
2615
MPU_REGION_ENTRY("FLASH_0",
2716
CONFIG_FLASH_BASE_ADDRESS,
2817
#if defined(CONFIG_ARMV8_M_BASELINE) || defined(CONFIG_ARMV8_M_MAINLINE)
@@ -33,6 +22,7 @@ static const struct arm_mpu_region mpu_regions[] = {
3322
#endif
3423
#endif
3524

25+
/* Region 1 */
3626
MPU_REGION_ENTRY("SRAM_0",
3727
CONFIG_SRAM_BASE_ADDRESS,
3828
#if defined(CONFIG_ARMV8_M_BASELINE) || defined(CONFIG_ARMV8_M_MAINLINE)

0 commit comments

Comments
 (0)