Skip to content

fix and re-enable Zephyr builds for apl with xcc #4852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 2 commits into from
Oct 14, 2021
Merged

fix and re-enable Zephyr builds for apl with xcc #4852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45e3a77
zephyr: further reduce the size of heap on APL with XCC
lyakh Oct 7, 2021
d50bef3
zephyr: apl: re-enable building with XCC
lyakh Oct 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions scripts/xtensa-build-zephyr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,8 @@ build_all()
case "$platform" in
apl)
PLAT_CONFIG='intel_adsp_cavs15'
# XCC build runs out of memory, tracked as
# https://github.com/thesofproject/sof/issues/4645
unset XTENSA_TOOLS_ROOT
#XTENSA_CORE="X4H3I16w2D48w3a_2017_8"
#XTENSA_TOOLS_VERSION="RG-2017.8-linux"
XTENSA_CORE="X4H3I16w2D48w3a_2017_8"
XTENSA_TOOLS_VERSION="RG-2017.8-linux"
;;
cnl)
PLAT_CONFIG='intel_adsp_cavs18'
Expand Down
4 changes: 4 additions & 0 deletions zephyr/wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ __section(".heap_mem") static uint8_t __aligned(64) heapmem[HEAPMEM_SIZE];
*/
#if (CONFIG_HP_MEMORY_BANKS < 16)
/* e.g. APL */
#if defined __XCC__
#define HEAP_SIZE 0x28000
#else
#define HEAP_SIZE 0x30000
#endif
#elif (CONFIG_HP_MEMORY_BANKS < 30)
/* e.g. JSL */
#define HEAP_SIZE 0x80000
Expand Down