Skip to content

Commit a99b8da

Browse files
committed
[nrf fromlist] zephyr: arch: arm: cortex_m: linker: Add missing XIP check
Adds a missing check for CONFIG_XIP to be set to use the mapped partition information, this was wrongly missed from here when it was added to the other linker files Upstream PR #: 106058 Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
1 parent f20e533 commit a99b8da

File tree

1 file changed

+1
-1
lines changed
  • include/zephyr/arch/arm/cortex_m/scripts

1 file changed

+1
-1
lines changed

include/zephyr/arch/arm/cortex_m/scripts/linker.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ _image_1_primary_slot_id = PM_S1_ID;
7373
#define ROM_END_OFFSET 0
7474
#endif
7575

76-
#if defined(CONFIG_FLASH_USES_MAPPED_PARTITION)
76+
#if defined(CONFIG_FLASH_USES_MAPPED_PARTITION) && defined(CONFIG_XIP)
7777
#define ROM_ADDR (DT_REG_ADDR(DT_CHOSEN(zephyr_code_partition)))
7878
#define ROM_SIZE (DT_REG_SIZE(DT_CHOSEN(zephyr_code_partition)) - ROM_END_OFFSET)
7979
#else

0 commit comments

Comments
 (0)