Skip to content

Commit 92248a1

Browse files
authored
Merge pull request zephyrproject-rtos#13 from finikorg/sof/fix
Fix some build issues
2 parents 395d7b6 + ab575f2 commit 92248a1

File tree

5 files changed

+4
-6
lines changed

5 files changed

+4
-6
lines changed

boards/xtensa/up_squared_adsp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: Apache-2.0
22

33
add_custom_target(
4-
process_elf ALL
4+
process_elf
55
DEPENDS sof_base_module
66
DEPENDS ${ZEPHYR_FINAL_EXECUTABLE}
77
COMMAND ${CMAKE_OBJCOPY} --dump-section .data=mod-apl.bin ${CMAKE_BINARY_DIR}/modules/sof/libsof_base_module.a

dts/bindings/interrupt-controller/intel,cavs-intc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: >
55
66
compatible: "intel,cavs-intc"
77

8-
include: base.yaml
8+
include: [interrupt-controller.yaml, base.yaml]
99

1010
properties:
1111
reg:

include/arch/xtensa/arch.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include <generated_dts_board.h>
1919
#if !defined(_ASMLANGUAGE) && !defined(__ASSEMBLER__)
20+
#include <toolchain.h>
2021
#include <arch/common/sys_io.h>
2122
#include <arch/common/ffs.h>
2223
#include <zephyr/types.h>

lib/libc/minimal/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3-
zephyr_system_include_directories(include)
3+
zephyr_include_directories(include)
44

55
zephyr_library()
66
zephyr_library_sources(

soc/xtensa/intel_apl_adsp/Kconfig.defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ config SOC
1212
config IRQ_OFFLOAD_INTNUM
1313
default 0
1414

15-
config XTENSA_ASM2
16-
default y
17-
1815
# S1000 does not have MISC0.
1916
# Since EXCSAVE2 is unused by Zephyr, use it instead.
2017
config XTENSA_KERNEL_CPU_PTR_SR

0 commit comments

Comments
 (0)