Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 18 additions & 8 deletions scripts/xtensa-build-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ WORKDIR="$pwd"
for j in ${PLATFORMS[@]}
do
HAVE_ROM='no'
DEFCONFIG_PATCH=''
if [ $j == "byt" ]
then
PLATFORM="baytrail"
Expand All @@ -128,15 +129,19 @@ do
then
PLATFORM="broadwell"
ARCH="xtensa"
XTENSA_CORE="LX4_langwell_audio_17_8"
ROOT="$pwd/../xtensa-root/xtensa-hsw-elf"
HOST="xtensa-hsw-elf"
XTENSA_TOOLS_VERSION="RG-2017.8-linux"
fi
if [ $j == "hsw" ]
then
PLATFORM="haswell"
ARCH="xtensa"
XTENSA_CORE="LX4_langwell_audio_17_8"
ROOT="$pwd/../xtensa-root/xtensa-hsw-elf"
HOST="xtensa-hsw-elf"
XTENSA_TOOLS_VERSION="RG-2017.8-linux"
fi
if [ $j == "apl" ]
then
Expand Down Expand Up @@ -207,22 +212,22 @@ do
fi
if [ $j == "sue" ]
then
PLATFORM="suecreek"
PLATFORM="suecreek"
ARCH="xtensa"
XTENSA_CORE="X6H3CNL_2016_4_linux"
ROOT="$pwd/../xtensa-root/xtensa-cnl-elf"
HOST="xtensa-cnl-elf"
XTENSA_TOOLS_VERSION="RF-2016.4-linux"
XTENSA_CORE="X6H3CNL_2017_8"
ROOT="$pwd/../xtensa-root/xtensa-cnl-elf"
HOST="xtensa-cnl-elf"
XTENSA_TOOLS_VERSION="RG-2017.8-linux"
HAVE_ROM='yes'
fi
if [ $j == "icl" ]
then
PLATFORM="icelake"
ARCH="xtensa-smp"
XTENSA_CORE="X6H3CNL_2016_4_linux"
XTENSA_CORE="X6H3CNL_2017_8"
ROOT="$pwd/../xtensa-root/xtensa-cnl-elf"
HOST="xtensa-cnl-elf"
XTENSA_TOOLS_VERSION="RF-2016.4-linux"
XTENSA_TOOLS_VERSION="RG-2017.8-linux"
HAVE_ROM='yes'
fi
if [ $j == "jsl" ]
Expand Down Expand Up @@ -269,6 +274,11 @@ do
export XTENSA_SYSTEM=$XTENSA_BUILDS_DIR/$XTENSA_CORE/config
PATH=$XTENSA_TOOLS_DIR/XtensaTools/bin:$OLDPATH
COMPILER="xcc"

if [ $j == "byt" ] || [ $j == "cht" ] || [ $j == "sue" ]
then
DEFCONFIG_PATCH="_xcc"
fi
else
TOOLCHAIN=$HOST
PATH=$pwd/../$HOST/bin:$OLDPATH
Expand All @@ -289,7 +299,7 @@ do
${PRIVATE_KEY_OPTION} \
..

make ${PLATFORM}_defconfig
make ${PLATFORM}${DEFCONFIG_PATCH}_defconfig

if [[ "x$MAKE_MENUCONFIG" == "xyes" ]]
then
Expand Down
8 changes: 8 additions & 0 deletions src/arch/xtensa/configs/baytrail_xcc_defconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CONFIG_BAYTRAIL=y
CONFIG_COMP_TEST_KEYPHRASE=n
CONFIG_COMP_KPB=n
CONFIG_COMP_SEL=n
CONFIG_COMP_MUX=n
CONFIG_COMP_FIR=n
CONFIG_COMP_IIR=n
CONFIG_OPTIMIZE_FOR_SIZE=y
8 changes: 8 additions & 0 deletions src/arch/xtensa/configs/cherrytrail_xcc_defconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CONFIG_CHERRYTRAIL=y
CONFIG_COMP_TEST_KEYPHRASE=n
CONFIG_COMP_KPB=n
CONFIG_COMP_SEL=n
CONFIG_COMP_MUX=n
CONFIG_COMP_FIR=n
CONFIG_COMP_IIR=n
CONFIG_OPTIMIZE_FOR_SIZE=y
7 changes: 7 additions & 0 deletions src/arch/xtensa/configs/suecreek_xcc_defconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
CONFIG_SUECREEK=y
CONFIG_CAVS_DMIC=y
CONFIG_CAVS_SSP=y
CONFIG_CORE_COUNT=4
CONFIG_LP_MEMORY_BANKS=1
CONFIG_HP_MEMORY_BANKS=47
CONFIG_OPTIMIZE_FOR_SIZE=y
6 changes: 3 additions & 3 deletions src/arch/xtensa/include/arch/string.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ int memset_s(void *dest, size_t dest_size,
int memcpy_s(void *dest, size_t dest_size,
const void *src, size_t src_size);

#if __XCC__ && !CONFIG_LIBRARY
#if __XCC__ && XCHAL_HAVE_HIFI3 && !CONFIG_LIBRARY
void *__vec_memcpy(void *dst, const void *src, size_t len);
void *__vec_memset(void *dest, int data, size_t src_size);
#endif
Expand All @@ -54,7 +54,7 @@ static inline int arch_memcpy_s(void *dest, size_t dest_size,
if (src_size > dest_size)
return -EINVAL;

#if __XCC__ && !CONFIG_LIBRARY
#if __XCC__ && XCHAL_HAVE_HIFI3 && !CONFIG_LIBRARY
__vec_memcpy(dest, src, src_size);
#else
memcpy(dest, src, src_size);
Expand All @@ -72,7 +72,7 @@ static inline int arch_memset_s(void *dest, size_t dest_size,
if (count > dest_size)
return -EINVAL;

#if __XCC__ && !CONFIG_LIBRARY
#if __XCC__ && XCHAL_HAVE_HIFI3 && !CONFIG_LIBRARY
if (!__vec_memset(dest, data, count))
return -ENOMEM;
#else
Expand Down
2 changes: 1 addition & 1 deletion src/platform/haswell/haswell.x.in
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ ENTRY(_ResetVector)
_rom_store_table = 0;

/* ABI0 does not use Window base */
PROVIDE(_memmap_vecbase_reset = XCHAL_VECBASE_RESET_PADDR);
PROVIDE(_memmap_vecbase_reset = SOF_MEM_VECBASE_TEXT_BASE);

/* Various memory-map dependent cache attribute settings: */
_memmap_cacheattr_wb_base = 0x44024000;
Expand Down
6 changes: 3 additions & 3 deletions src/platform/suecreek/include/platform/lib/memory.h
Original file line number Diff line number Diff line change
Expand Up @@ -382,12 +382,12 @@
/* code loader */
#define BOOT_LDR_TEXT_ENTRY_BASE (BOOT_LDR_MANIFEST_BASE + \
BOOT_LDR_MANIFEST_SIZE)
#define BOOT_LDR_TEXT_ENTRY_SIZE 0x400
#define BOOT_LDR_TEXT_ENTRY_SIZE 0x200
#define BOOT_LDR_LIT_BASE (BOOT_LDR_TEXT_ENTRY_BASE + \
BOOT_LDR_TEXT_ENTRY_SIZE)
#define BOOT_LDR_LIT_SIZE 0x400
#define BOOT_LDR_LIT_SIZE 0x200
#define BOOT_LDR_TEXT_BASE (BOOT_LDR_LIT_BASE + BOOT_LDR_LIT_SIZE)
#define BOOT_LDR_TEXT_SIZE 0x800
#define BOOT_LDR_TEXT_SIZE 0xC00
#define BOOT_LDR_DATA_BASE (BOOT_LDR_TEXT_BASE + \
BOOT_LDR_TEXT_SIZE)
#define BOOT_LDR_DATA_SIZE 0x1000
Expand Down