From 66df94b61869612a100a2d27010e049a82c188ae Mon Sep 17 00:00:00 2001 From: Andrej Butok Date: Thu, 23 Jan 2025 10:12:16 +0100 Subject: [PATCH] boards: mimxrt1180: fix MCUBoot build - Fixes building of MCUBoot for mimxrt1180-evk. - Disables RT Boot header for MCUBoot applications. Signed-off-by: Andrej Butok --- boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm33.dts | 2 ++ soc/nxp/imxrt/imxrt118x/Kconfig.defconfig | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm33.dts b/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm33.dts index 7624b070402..1666800227e 100644 --- a/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm33.dts +++ b/boards/nxp/mimxrt1180_evk/mimxrt1180_evk_mimxrt1189_cm33.dts @@ -19,8 +19,10 @@ zephyr,itcm = &itcm; zephyr,flash-controller = &w25q128jw; zephyr,flash = &w25q128jw; + zephyr,code-partition = &slot0_partition; zephyr,console = &lpuart1; zephyr,shell-uart = &lpuart1; + zephyr,uart-mcumgr = &lpuart1; zephyr,canbus = &flexcan3; }; diff --git a/soc/nxp/imxrt/imxrt118x/Kconfig.defconfig b/soc/nxp/imxrt/imxrt118x/Kconfig.defconfig index 74f22955c68..ebdfa78693b 100644 --- a/soc/nxp/imxrt/imxrt118x/Kconfig.defconfig +++ b/soc/nxp/imxrt/imxrt118x/Kconfig.defconfig @@ -30,7 +30,8 @@ if SECOND_CORE_MCUX # RT Boot header is only needed on primary core config NXP_IMXRT_BOOT_HEADER - depends on !CPU_CORTEX_M7 + default y + depends on !(CPU_CORTEX_M7 || BOOTLOADER_MCUBOOT) endif # SECOND_CORE_MCUX