diff --git a/soc/nxp/imxrt/boot_header.ld b/soc/nxp/imxrt/boot_header.ld index b61487c4819..e52e64506f4 100644 --- a/soc/nxp/imxrt/boot_header.ld +++ b/soc/nxp/imxrt/boot_header.ld @@ -10,9 +10,9 @@ __Vectors = __VECTOR_TABLE; #endif #if defined(CONFIG_BOOT_XSPI_NOR) -. = CONFIG_XSPI_CONFIG_BLOCK_OFFSET; +. += CONFIG_XSPI_CONFIG_BLOCK_OFFSET - (. - __rom_start_address); #else -. = CONFIG_FLEXSPI_CONFIG_BLOCK_OFFSET; +. += CONFIG_FLEXSPI_CONFIG_BLOCK_OFFSET - (. - __rom_start_address); #endif #if defined(CONFIG_SOC_SERIES_IMXRT11XX) || defined(CONFIG_SOC_SERIES_IMXRT10XX) || defined(CONFIG_SOC_SERIES_IMXRT118X) KEEP(*(.boot_hdr.conf)) @@ -22,13 +22,13 @@ KEEP(*(.flash_conf)) #endif #if defined(CONFIG_SOC_SERIES_IMXRT118X) #ifdef CONFIG_EXTERNAL_MEM_CONFIG_DATA - . = CONFIG_EXTERNAL_MEM_CONFIG_OFFSET; + . += CONFIG_EXTERNAL_MEM_CONFIG_OFFSET - (. - __rom_start_address); KEEP(*(.boot_hdr.xmcd_data)) #endif -. = CONFIG_IMAGE_CONTAINER_OFFSET; +. += CONFIG_IMAGE_CONTAINER_OFFSET - (. - __rom_start_address); KEEP(*(.boot_hdr.container)) #else -. = CONFIG_IMAGE_VECTOR_TABLE_OFFSET; +. += CONFIG_IMAGE_VECTOR_TABLE_OFFSET - (. - __rom_start_address); KEEP(*(.boot_hdr.ivt)) #endif #if defined(CONFIG_SOC_SERIES_IMXRT11XX) || defined(CONFIG_SOC_SERIES_IMXRT10XX) @@ -37,7 +37,7 @@ KEEP(*(.boot_hdr.data)) KEEP(*(.boot_hdr.dcd_data)) #endif /* CONFIG_DEVICE_CONFIGURATION_DATA */ #ifdef CONFIG_EXTERNAL_MEM_CONFIG_DATA - . = CONFIG_EXTERNAL_MEM_CONFIG_OFFSET; + . += CONFIG_EXTERNAL_MEM_CONFIG_OFFSET - (. - __rom_start_address); KEEP(*(.boot_hdr.xmcd_data)) #endif #endif /* CONFIG_SOC_SERIES_IMXRT10XX || CONFIG_SOC_SERIES_IMXRT11XX */ diff --git a/soc/nxp/rw/boot_header.ld b/soc/nxp/rw/boot_header.ld index ee0be5b4753..eadc03a4035 100644 --- a/soc/nxp/rw/boot_header.ld +++ b/soc/nxp/rw/boot_header.ld @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -. = CONFIG_FLASH_CONFIG_OFFSET; +. += CONFIG_FLASH_CONFIG_OFFSET - (. - __rom_start_address); KEEP(*(.flash_conf)) -. = CONFIG_IMAGE_VECTOR_TABLE_OFFSET; +. += CONFIG_IMAGE_VECTOR_TABLE_OFFSET - (. - __rom_start_address); KEEP(*(.boot_hdr.ivt))