Skip to content

Commit 97179c1

Browse files
pdgendtMaureenHelm
authored andcommitted
soc: nxp_imx: Disable IVT/DCD when building for mcuboot
The bootloader application itself should contain the IVT/DCD in the header, but the chainable application doesn't. The ROM_START_OFFSET defaults to 0x400 otherwise the linker alignment isn't taken into account. Signed-off-by: Pieter De Gendt <[email protected]>
1 parent add98e7 commit 97179c1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

soc/arm/nxp_imx/rt/Kconfig.defconfig.series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ config SOC_SERIES
99
default "rt"
1010

1111
config ROM_START_OFFSET
12+
default 0x400 if BOOTLOADER_MCUBOOT
1213
default 0x2000 if BOOT_FLEXSPI_NOR || BOOT_SEMC_NOR
1314

1415
config CAN_MCUX_FLEXCAN

soc/arm/nxp_imx/rt/Kconfig.soc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ config IPG_DIV
385385

386386
menuconfig NXP_IMX_RT_BOOT_HEADER
387387
bool "Enable the boot header"
388+
depends on !BOOTLOADER_MCUBOOT
388389
help
389390
Enable data structures required by the boot ROM to boot the
390391
application from an external flash device.
@@ -448,11 +449,11 @@ config CODE_ITCM
448449

449450
config CODE_FLEXSPI
450451
bool "Link code into external FlexSPI-controlled memory"
451-
select NXP_IMX_RT_BOOT_HEADER
452+
select NXP_IMX_RT_BOOT_HEADER if !BOOTLOADER_MCUBOOT
452453

453454
config CODE_FLEXSPI2
454455
bool "Link code into internal FlexSPI-controlled memory"
455-
select NXP_IMX_RT_BOOT_HEADER
456+
select NXP_IMX_RT_BOOT_HEADER if !BOOTLOADER_MCUBOOT
456457

457458
endchoice
458459

0 commit comments

Comments
 (0)