michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: Simplify private header include path configuration.

Browse source 
When compiling the components under the arch directory, the compiler
include paths for arch and kernel private headers need to be specified.

This was previously done by adding 'zephyr_library_include_directories'
to CMakeLists.txt file for every component under the arch directory,
and this resulted in a significant amount of duplicate code.

This commit uses the CMake 'include_directories' command in the root
CMakeLists.txt to simplify specification of the private header include
paths for all the arch components.

Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
This commit is contained in:
Stephanos Ioannidis 2019-11-01 20:10:26 +09:00 • committed by Andrew Boie
commit 7bcfdadf81
15 changed files with 28 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

5
arch/CMakeLists.txt
View file

@ -2,5 +2,10 @@
add_definitions(-D__ZEPHYR_SUPERVISOR__)
include_directories(
${ZEPHYR_BASE}/kernel/include
${ZEPHYR_BASE}/arch/${ARCH}/include
)
add_subdirectory(common)
add_subdirectory(${ARCH_DIR}/${ARCH} arch/${ARCH})

5
arch/arc/core/CMakeLists.txt
View file

@ -28,10 +28,5 @@ zephyr_library_sources_ifdef(CONFIG_USERSPACE userspace.S)
zephyr_library_sources_ifdef(CONFIG_ARC_CONNECT arc_connect.c)
zephyr_library_sources_ifdef(CONFIG_SMP arc_smp.c)
zephyr_library_include_directories(
${ZEPHYR_BASE}/kernel/include
${ZEPHYR_BASE}/arch/arc/include
)
add_subdirectory_ifdef(CONFIG_ARC_CORE_MPU mpu)
add_subdirectory_ifdef(CONFIG_ARC_SECURE_FIRMWARE secureshield)

5
arch/arc/core/mpu/CMakeLists.txt
View file

@ -4,8 +4,3 @@ zephyr_library()
zephyr_library_sources_if_kconfig(arc_core_mpu.c)
zephyr_library_sources_if_kconfig(arc_mpu.c)
zephyr_library_include_directories(
${ZEPHYR_BASE}/kernel/include
${ZEPHYR_BASE}/arch/arc/include
)

5
arch/arc/core/secureshield/CMakeLists.txt
View file

@ -10,8 +10,3 @@ zephyr_library_sources(
arc_secure.S
secure_sys_services.c
)
zephyr_library_include_directories(
${ZEPHYR_BASE}/kernel/include
${ZEPHYR_BASE}/arch/arc/include
)

5
arch/arm/core/CMakeLists.txt
View file

@ -20,11 +20,6 @@ zephyr_library_sources(
prep_c.c
)
zephyr_library_include_directories(
${ZEPHYR_BASE}/kernel/include
${ZEPHYR_BASE}/arch/arm/include
)
zephyr_library_sources_ifdef(CONFIG_GEN_SW_ISR_TABLE isr_wrapper.S)
zephyr_library_sources_ifdef(CONFIG_CPLUSPLUS __aeabi_atexit.c)
zephyr_library_sources_ifdef(CONFIG_IRQ_OFFLOAD irq_offload.c)

5
arch/arm/core/cortex_m/CMakeLists.txt
View file

@ -15,8 +15,3 @@ zephyr_linker_sources_ifdef(CONFIG_SW_VECTOR_RELAY
RAM_SECTIONS
vt_pointer_section.ld
)
zephyr_library_include_directories(
${ZEPHYR_BASE}/kernel/include
${ZEPHYR_BASE}/arch/arm/include
)

4
arch/arm/core/cortex_m/cmse/CMakeLists.txt
View file

@ -1,3 +1,5 @@
# SPDX-License-Identifier: Apache-2.0
zephyr_sources(arm_core_cmse.c)
zephyr_library()
zephyr_library_sources(arm_core_cmse.c)

6
arch/arm/core/cortex_m/tz/CMakeLists.txt
View file

@ -32,4 +32,8 @@ zephyr_link_libraries_ifdef(CONFIG_ARM_FIRMWARE_USES_SECURE_ENTRY_FUNCS
${CMAKE_BINARY_DIR}/${CONFIG_ARM_ENTRY_VENEERS_LIB_NAME}
)
zephyr_sources_ifdef(CONFIG_ARM_SECURE_FIRMWARE arm_core_tz.c)
if(CONFIG_ARM_SECURE_FIRMWARE)
zephyr_library()
zephyr_library_sources(arm_core_tz.c)
endif()

5
arch/arm/core/cortex_r/CMakeLists.txt
View file

@ -9,8 +9,3 @@ zephyr_library_sources(
reboot.c
stacks.c
)
zephyr_library_include_directories(
${ZEPHYR_BASE}/kernel/include
${ZEPHYR_BASE}/arch/arm/include
)

31
arch/common/CMakeLists.txt
View file

@ -1,20 +1,24 @@
# SPDX-License-Identifier: Apache-2.0
if(CONFIG_GEN_ISR_TABLES OR CONFIG_EXECUTION_BENCHMARKING)
zephyr_library()
zephyr_library_sources_ifdef(
CONFIG_GEN_ISR_TABLES
isr_tables.c
sw_isr_common.c
)
zephyr_library_sources_ifdef(
CONFIG_EXECUTION_BENCHMARKING
timing_info_bench.c
)
endif()
# Put functions and data in their own binary sections so that ld can
# garbage collect them
zephyr_cc_option(-ffunction-sections -fdata-sections)
zephyr_sources_ifdef(
CONFIG_GEN_ISR_TABLES
isr_tables.c
sw_isr_common.c
)
zephyr_sources_ifdef(
CONFIG_EXECUTION_BENCHMARKING
timing_info_bench.c
)
zephyr_linker_sources_ifdef(CONFIG_GEN_ISR_TABLES
SECTIONS
isr_tables.ld
@ -29,8 +33,3 @@ zephyr_linker_sources_ifdef(CONFIG_NOCACHE_MEMORY
RAM_SECTIONS
nocache.ld
)
zephyr_library_include_directories(
${ZEPHYR_BASE}/kernel/include
${ZEPHYR_BASE}/arch/${ARCH}/include
)

5
arch/nios2/core/CMakeLists.txt
View file

@ -16,8 +16,3 @@ zephyr_library_sources(
)
zephyr_library_sources_if_kconfig(irq_offload.c)
zephyr_library_include_directories(
${ZEPHYR_BASE}/kernel/include
${ZEPHYR_BASE}/arch/nios2/include
)

5
arch/riscv/core/CMakeLists.txt
View file

@ -14,8 +14,3 @@ zephyr_library_sources(
)
zephyr_library_sources_if_kconfig(irq_offload.c)
zephyr_library_include_directories(
${ZEPHYR_BASE}/kernel/include
${ZEPHYR_BASE}/arch/riscv/include
)

5
arch/x86/core/CMakeLists.txt
View file

@ -19,11 +19,6 @@ zephyr_library_sources_if_kconfig(x86_mmu.c)
zephyr_library_sources_ifdef(CONFIG_X86_VERY_EARLY_CONSOLE early_serial.c)
zephyr_library_include_directories(
${ZEPHYR_BASE}/kernel/include
${ZEPHYR_BASE}/arch/x86/include
)
if(CONFIG_X86_64)
include(intel64.cmake)
else()

5
arch/xtensa/core/CMakeLists.txt
View file

@ -16,9 +16,4 @@ zephyr_library_sources_ifndef(CONFIG_ATOMIC_OPERATIONS_C atomic.S)
zephyr_library_sources_ifdef(CONFIG_XTENSA_USE_CORE_CRT1 crt1.S)
zephyr_library_sources_ifdef(CONFIG_IRQ_OFFLOAD irq_offload.c)
zephyr_library_include_directories(
${ZEPHYR_BASE}/kernel/include
${ZEPHYR_BASE}/arch/xtensa/include
)
add_subdirectory(startup)

5
arch/xtensa/core/startup/CMakeLists.txt
View file

@ -14,9 +14,4 @@ if(CONFIG_XTENSA_RESET_VECTOR)
memerror-vector.S
memctl_default.S
)
zephyr_library_include_directories(
${ZEPHYR_BASE}/kernel/include
${ZEPHYR_BASE}/arch/xtensa/include
)
endif()