Skip to content

Commit d4d0922

Browse files
wearyzenkartben
authored andcommitted
arch: arm: fix ci failure
This is to fix ci failure caused by commit d5d4d57 In the above commit, it's wrongly assumed that ROM_ADDR and RAM_ADDR are same **only** when CONFIG_XIP is not defined. Since aarch64 was taken as reference in the review, we missed to see that CONFIG_FLASH_SIZE is also part of the condition to define ROM_ADDR as RAM_ADDR. CONFIG_XIP is not defined for qemu_cortex_a9/xc7z007s however, CONFIG_FLASH_SIZE is not 0 so the assumption fails and the required reset to RAM_ADDR is not applied leading to the test failure. Signed-off-by: Sudan Landge <[email protected]>
1 parent f3a3ad3 commit d4d0922

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ SECTIONS
257257

258258
GROUP_START(RAMABLE_REGION)
259259

260-
#ifdef CONFIG_XIP
260+
#if ROM_ADDR != RAM_ADDR
261261
. = RAM_ADDR;
262262
#endif
263263

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ SECTIONS
257257

258258
GROUP_START(RAMABLE_REGION)
259259

260-
#ifdef CONFIG_XIP
260+
#if ROM_ADDR != RAM_ADDR
261261
. = RAM_ADDR;
262262
#endif
263263

0 commit comments

Comments
 (0)