Skip to content

Conversation

@wearyzen
Copy link
Contributor

@wearyzen wearyzen commented Apr 1, 2025

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.

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 <sudan.landge@arm.com>
@github-actions github-actions bot added area: ARM ARM (32-bit) Architecture area: Architectures labels Apr 1, 2025
@kartben kartben added the Hotfix Fix for issues blocking development, i.e. upstream CI issues, tests failing in upstream CI , etc. label Apr 1, 2025
@kartben kartben merged commit d4d0922 into zephyrproject-rtos:main Apr 1, 2025
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area: Architectures area: ARM ARM (32-bit) Architecture Hotfix Fix for issues blocking development, i.e. upstream CI issues, tests failing in upstream CI , etc.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants