From 2cb75dc463524263a40dbf668df4ca4a971075e8 Mon Sep 17 00:00:00 2001 From: Andy Ross Date: Wed, 8 Sep 2021 11:45:08 -0700 Subject: [PATCH] soc/intel_adsp: Fix _ASMLANGUAGE declaration for boot_entry.S 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 --- soc/xtensa/intel_adsp/common/bootloader/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soc/xtensa/intel_adsp/common/bootloader/CMakeLists.txt b/soc/xtensa/intel_adsp/common/bootloader/CMakeLists.txt index 2589335ee3a..cd9960c0814 100644 --- a/soc/xtensa/intel_adsp/common/bootloader/CMakeLists.txt +++ b/soc/xtensa/intel_adsp/common/bootloader/CMakeLists.txt @@ -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()