Merge pull request zephyrproject-rtos#13 from finikorg/sof/fix

Fix some build issues
finikorg · Sep 18, 2019 · 92248a1 · 92248a1
2 parents 395d7b6 + ab575f2
commit 92248a1
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/boards/xtensa/up_squared_adsp/CMakeLists.txt b/boards/xtensa/up_squared_adsp/CMakeLists.txt
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 add_custom_target(
-  process_elf ALL
+  process_elf
   DEPENDS sof_base_module
   DEPENDS ${ZEPHYR_FINAL_EXECUTABLE}
   COMMAND ${CMAKE_OBJCOPY} --dump-section .data=mod-apl.bin ${CMAKE_BINARY_DIR}/modules/sof/libsof_base_module.a

diff --git a/dts/bindings/interrupt-controller/intel,cavs-intc.yaml b/dts/bindings/interrupt-controller/intel,cavs-intc.yaml
@@ -5,7 +5,7 @@ description: >
 
 compatible: "intel,cavs-intc"
 
-include: base.yaml
+include: [interrupt-controller.yaml, base.yaml]
 
 properties:
   reg:

diff --git a/include/arch/xtensa/arch.h b/include/arch/xtensa/arch.h
@@ -17,6 +17,7 @@
 
 #include <generated_dts_board.h>
 #if !defined(_ASMLANGUAGE) && !defined(__ASSEMBLER__)
+#include <toolchain.h>
 #include <arch/common/sys_io.h>
 #include <arch/common/ffs.h>
 #include <zephyr/types.h>

diff --git a/lib/libc/minimal/CMakeLists.txt b/lib/libc/minimal/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-zephyr_system_include_directories(include)
+zephyr_include_directories(include)
 
 zephyr_library()
 zephyr_library_sources(

diff --git a/soc/xtensa/intel_apl_adsp/Kconfig.defconfig b/soc/xtensa/intel_apl_adsp/Kconfig.defconfig
@@ -12,9 +12,6 @@ config SOC
 config IRQ_OFFLOAD_INTNUM
 	default 0
 
-config XTENSA_ASM2
-	default y
-
 # S1000 does not have MISC0.
 # Since EXCSAVE2 is unused by Zephyr, use it instead.
 config XTENSA_KERNEL_CPU_PTR_SR