From b09b5dd262192c2dac82f2436fac7d60c806088e Mon Sep 17 00:00:00 2001 From: Declan Snyder Date: Mon, 6 Oct 2025 19:22:15 -0500 Subject: [PATCH] Revert "soc: RT700 add custom MPU regions for non-cache memory" This reverts commit 4a6a969bbe00dc82827060b5d24376565d446378. Signed-off-by: Declan Snyder --- soc/nxp/imxrt/imxrt7xx/cm33/CMakeLists.txt | 4 ---- soc/nxp/imxrt/imxrt7xx/cm33/Kconfig | 1 - soc/nxp/imxrt/imxrt7xx/cm33/mpu_regions.c | 22 ---------------------- 3 files changed, 27 deletions(-) delete mode 100644 soc/nxp/imxrt/imxrt7xx/cm33/mpu_regions.c diff --git a/soc/nxp/imxrt/imxrt7xx/cm33/CMakeLists.txt b/soc/nxp/imxrt/imxrt7xx/cm33/CMakeLists.txt index 3596a099e2eb2..6e6f2a42fb24b 100644 --- a/soc/nxp/imxrt/imxrt7xx/cm33/CMakeLists.txt +++ b/soc/nxp/imxrt/imxrt7xx/cm33/CMakeLists.txt @@ -17,10 +17,6 @@ zephyr_sources_ifdef(CONFIG_MIPI_DSI display_if.c) zephyr_sources_ifdef(CONFIG_MFD_PCA9422 pmic_int.c) -if(CONFIG_SOC_MIMXRT798S_CM33_CPU0) - zephyr_sources(mpu_regions.c) -endif() - if(CONFIG_FLASH_MCUX_XSPI_XIP) zephyr_sources(flash_clock_setup.c) zephyr_code_relocate(FILES flash_clock_setup.c LOCATION ${CONFIG_FLASH_MCUX_XSPI_XIP_MEM}_TEXT) diff --git a/soc/nxp/imxrt/imxrt7xx/cm33/Kconfig b/soc/nxp/imxrt/imxrt7xx/cm33/Kconfig index 34d1d8da87f37..f90e6446033b0 100644 --- a/soc/nxp/imxrt/imxrt7xx/cm33/Kconfig +++ b/soc/nxp/imxrt/imxrt7xx/cm33/Kconfig @@ -8,7 +8,6 @@ config SOC_MIMXRT798S_CM33_CPU0 select ARM select CPU_HAS_ARM_SAU select CPU_HAS_ARM_MPU - select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS select CPU_HAS_FPU select ARMV8_M_DSP select ARM_TRUSTZONE_M diff --git a/soc/nxp/imxrt/imxrt7xx/cm33/mpu_regions.c b/soc/nxp/imxrt/imxrt7xx/cm33/mpu_regions.c deleted file mode 100644 index 3ee65720201f2..0000000000000 --- a/soc/nxp/imxrt/imxrt7xx/cm33/mpu_regions.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2025 NXP - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include -#include - -#define REGION_SRAM1_SHM_BASE_ADDRESS 0x30200000 -#define REGION_SRAM1_SHM_SIZE 0x00200000 - -static const struct arm_mpu_region mpu_regions[] = { - MPU_REGION_ENTRY( - "SRAM2_SHM", REGION_SRAM1_SHM_BASE_ADDRESS, - REGION_RAM_NOCACHE_ATTR(REGION_SRAM1_SHM_BASE_ADDRESS, REGION_SRAM1_SHM_SIZE)), -}; - -const struct arm_mpu_config mpu_config = { - .num_regions = ARRAY_SIZE(mpu_regions), - .mpu_regions = mpu_regions, -};