This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit afdc7675c834b48b9778639ff5bc63b5e2258db3 Author: Erkan Vatan <[email protected]> AuthorDate: Sat Oct 25 11:47:19 2025 +0300 arch/armv7-r: Include arm_mpu.c when CONFIG_ARM_MPU is enabled. Previously, arm_mpu.c was only compiled when CONFIG_BUILD_PROTECTED was enabled. This caused build failures when CONFIG_ARM_MPU was set without CONFIG_BUILD_PROTECTED. The build logic has been updated to include arm_mpu.c whenever either CONFIG_ARM_MPU or CONFIG_BUILD_PROTECTED is enabled. Signed-off-by: Erkan Vatan <[email protected]> --- arch/arm/src/armv7-r/CMakeLists.txt | 2 +- arch/arm/src/armv7-r/Make.defs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/armv7-r/CMakeLists.txt b/arch/arm/src/armv7-r/CMakeLists.txt index 7db5e42d837..ca46fcf3105 100644 --- a/arch/arm/src/armv7-r/CMakeLists.txt +++ b/arch/arm/src/armv7-r/CMakeLists.txt @@ -57,7 +57,7 @@ if(CONFIG_ARMV7R_HAVE_PTM) list(APPEND SRCS arm_timer.c) endif() -if(CONFIG_BUILD_PROTECTED) +if(CONFIG_ARM_MPU OR CONFIG_BUILD_PROTECTED) list(APPEND SRCS arm_mpu.c) endif() diff --git a/arch/arm/src/armv7-r/Make.defs b/arch/arm/src/armv7-r/Make.defs index 688f5a9e791..3685b1cc435 100644 --- a/arch/arm/src/armv7-r/Make.defs +++ b/arch/arm/src/armv7-r/Make.defs @@ -49,7 +49,7 @@ ifeq ($(CONFIG_ARMV7R_HAVE_PTM),y) CMN_CSRCS += arm_timer.c endif -ifeq ($(CONFIG_BUILD_PROTECTED),y) +ifneq ($(filter y,$(CONFIG_ARM_MPU) $(CONFIG_BUILD_PROTECTED)),) CMN_CSRCS += arm_mpu.c endif
