Skip to content

soc: intel_adsp: cavs_v20: fix overlapping .noinit and .cached#40472

Closed
dcpleung wants to merge 1 commit intozephyrproject-rtos:mainfrom
dcpleung:intel_adsp_cavs20_linker_script_fix
Closed

soc: intel_adsp: cavs_v20: fix overlapping .noinit and .cached#40472
dcpleung wants to merge 1 commit intozephyrproject-rtos:mainfrom
dcpleung:intel_adsp_cavs20_linker_script_fix

Conversation

@dcpleung
Copy link
Member

Previous changes to linker script for intel_adsp/cavs_v20 to fix
XCC build issues resulted in another problem where .noinit
and .cached both had overlapping "cached" addresses. Rimage
thus refused to build the firmware.

This updates the linker script to align it closer to cavs_v25
which is working with rimage.

Signed-off-by: Daniel Leung daniel.leung@intel.com

@andyross
Copy link
Contributor

Again no reason to refuse it, but #39603 contains a unified linker script for all cavs soc's. Continuing to massage this in place instead of trying to get that merged seems like wasted work.

@marc-hb
Copy link
Contributor

marc-hb commented Nov 19, 2021

This may be wasted effort but unlike #39603 this is a single commit faster to review/approve/test/merge/cherry-pick/revert/backport/etc. and can quickly address the ICL build regression introduced by #40319 which would allow reverting thesofproject/sof@d4b8a01f206ca7a9 that temporarily disables ICL (bad).

Successfully build-Tested-By: @marc-hb with ./scripts/xtensa-build-zephyr.sh icl and the crosstool-ng toolchain.
I did NOT review the code and I don't have an ICL platform either, all I'm saying is this fixes the build (which is a lot)

@marc-hb
Copy link
Contributor

marc-hb commented Nov 19, 2021

Nit: the commit message should really reference 2d5c724

Copy link
Contributor

@kv2019i kv2019i left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @dcpleung ! Build test ok with SOF cavs20 config.

@zephyrbot zephyrbot added the platform: Intel ADSP Intel Audio platforms label Nov 19, 2021
Previous commit 2d5c724
and commit 566c466) changed
the  linker script for intel_adsp/cavs_v20 to fix
XCC build issues resulted in another problem where .noinit
and .cached both had overlapping "cached" addresses. Rimage
thus refused to build the firmware.

This updates the linker script to align it closer to cavs_v25
which is working with rimage.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
@dcpleung dcpleung force-pushed the intel_adsp_cavs20_linker_script_fix branch from b349a8d to 8149ba4 Compare November 19, 2021 18:44
@dcpleung
Copy link
Member Author

Updated the commit message to mention the previous commits. There is no code changes.

Note that this is just a quick fix to un-break the build and image signing. Will close this if #39603 gets merged before this one.

@dcpleung
Copy link
Member Author

#39603 is merged, so closing this one.

@dcpleung dcpleung closed this Nov 23, 2021
@dcpleung dcpleung deleted the intel_adsp_cavs20_linker_script_fix branch November 23, 2021 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

platform: Intel ADSP Intel Audio platforms

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants