michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc/intel_adsp: Fix _ASMLANGUAGE declaration for boot_entry.S

Browse source 
The cAVS bootloader code (for... somewhat silly reasons) doesn't build
via the same paths as regular Zephyr object files, so it wasn't
getting the _ASMLANGUAGE define.  That meant that Zephyr headers
defining BIT() were using syntax incompatible with some assemblers
(specifically the Cadence xcc assembly; current gas versions were
fine).

Not 100% sure this is the best spot to put this, but the root fix is
to get the bootloader building into the same link as the rest of
Zephyr anyway.

Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
This commit is contained in:
Andy Ross 2021-09-08 11:45:08 -07:00 • committed by Anas Nashif
commit 2cb75dc463
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soc/xtensa/intel_adsp/common/bootloader/CMakeLists.txt
View file

@ -60,7 +60,7 @@ add_custom_command(TARGET bootloader
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
set_source_files_properties(boot_entry.S PROPERTIES COMPILE_FLAGS -DASSEMBLY)
set_source_files_properties(boot_entry.S PROPERTIES COMPILE_FLAGS "-DASSEMBLY -D_ASMLANGUAGE")
if(CONFIG_RESET_VECTOR_IN_BOOTLOADER)
set_source_files_properties(${ARCH_DIR}/${ARCH}/core/startup/reset-vector.S PROPERTIES COMPILE_FLAGS -DBOOTLOADER)
endif()