Commit 47dc5086 authored by Harris Tomy's avatar Harris Tomy Committed by Jamie
Browse files

boot: zephyr: update NXP MPU define to new name 



Zephyr 4.1 changes `CONFIG_CPU_HAS_NXP_MPU` to `CONFIG_CPU_HAS_NXP_SYSMPU`. This change reflects that.

Signed-off-by: default avatarHarris Tomy <harristomy@gmail.com>
parent 468e2611

boot/zephyr/arm_cleanup.c

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <zephyr/toolchain.h>



#include <cmsis_core.h>

#if CONFIG_CPU_HAS_NXP_MPU

#if CONFIG_CPU_HAS_NXP_SYSMPU

#include <fsl_sysmpu.h>

#endif
@@ -38,7 +38,7 @@ __weak void z_arm_clear_arm_mpu_config(void) 
		ARM_MPU_ClrRegion(i);

	}

}

#elif CONFIG_CPU_HAS_NXP_MPU

#elif CONFIG_CPU_HAS_NXP_SYSMPU

__weak void z_arm_clear_arm_mpu_config(void)

{

	int i;

boot/zephyr/include/arm_cleanup.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 */

void cleanup_arm_nvic(void);



#if defined(CONFIG_CPU_HAS_ARM_MPU) || defined(CONFIG_CPU_HAS_NXP_MPU)

#if defined(CONFIG_CPU_HAS_ARM_MPU) || defined(CONFIG_CPU_HAS_NXP_SYSMPU)

/**

 * Cleanup all ARM MPU region configuration

 */

boot/zephyr/main.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static void do_boot(struct boot_rsp *rsp) 
    sys_cache_data_disable();

#endif



#if CONFIG_CPU_HAS_ARM_MPU || CONFIG_CPU_HAS_NXP_MPU

#if CONFIG_CPU_HAS_ARM_MPU || CONFIG_CPU_HAS_NXP_SYSMPU

    z_arm_clear_arm_mpu_config();

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE