cmake: Merged n times arch_riscv32_Y libs into soc_- / arch_riscv32

Fixes: zephyrproject-rtos#8441 This commit merges the multiple sub libraries under soc_riscv32 and arch_riscv32, e.g. arch_riscv32_Y_Z into a single arch_riscv32 libraries. It also moves arch related stray files from libzephyr.a and places them inside the arch_${ARCH} library, see zephyrproject-rtos#8826. Signed-off-by: Torsten Rasmussen <[email protected]>
tejlmand · Dec 6, 2018 · 340fa5e · 340fa5e
1 parent f6b241f
commit 340fa5e
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 31 deletions.
diff --git a/arch/CMakeLists.txt b/arch/CMakeLists.txt
@@ -9,6 +9,7 @@ add_subdirectory(common)
 if( ( ${ARCH} STREQUAL arm ) OR
  ( ${ARCH} STREQUAL arc ) OR
  ( ${ARCH} STREQUAL posix ) OR
+ ( ${ARCH} STREQUAL riscv32 ) OR
  ( ${ARCH} STREQUAL nios2 )
 )
  include_relative(${ARCH}/CMakeLists.txt)

diff --git a/arch/riscv32/CMakeLists.txt b/arch/riscv32/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_subdirectory(core)
+include_relative(core/CMakeLists.txt)
 
 set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT elf32-littleriscv)
diff --git a/arch/riscv32/core/CMakeLists.txt b/arch/riscv32/core/CMakeLists.txt
@@ -1,11 +1,14 @@
-zephyr_sources(
- cpu_idle.c
- fatal.c
- irq_manage.c
- irq_offload.c
- isr.S
- prep_c.c
- reset.S
- swap.S
- thread.c
+zephyr_list(SOURCES
+ OUTPUT PRIVATE_SOURCES
+ cpu_idle.c
+ fatal.c
+ irq_manage.c
+ irq_offload.c
+ isr.S
+ prep_c.c
+ reset.S
+ swap.S
+ thread.c
 )
+
+target_sources(arch_riscv32 PRIVATE ${PRIVATE_SOURCES})
diff --git a/arch/riscv32/soc/riscv-privilege/CMakeLists.txt b/arch/riscv32/soc/riscv-privilege/CMakeLists.txt
@@ -0,0 +1,3 @@
+
+include_relative(common/CMakeLists.txt)
+include_relative(${SOC_SERIES}/CMakeLists.txt)
diff --git a/soc/posix/CMakeLists.txt b/soc/posix/CMakeLists.txt
@@ -1,6 +1,5 @@
 if(SOC_FAMILY)
- add_subdirectory(${SOC_FAMILY})
+ include_relative(${SOC_FAMILY}/CMakeLists.txt)
 else()
- add_subdirectory(${SOC_NAME})
+ include_relative(${SOC_NAME}/CMakeLists.txt)
 endif()
-
diff --git a/soc/riscv32/CMakeLists.txt b/soc/riscv32/CMakeLists.txt
@@ -1,6 +1,5 @@
 if(SOC_FAMILY)
- add_subdirectory(${SOC_FAMILY})
+ include_relative(${SOC_FAMILY}/CMakeLists.txt)
 else()
- add_subdirectory(${SOC_NAME})
+ include_relative(${SOC_NAME}/CMakeLists.txt)
 endif()
-
diff --git a/soc/riscv32/pulpino/CMakeLists.txt b/soc/riscv32/pulpino/CMakeLists.txt
@@ -5,9 +5,12 @@ zephyr_compile_options_ifndef(
  -march=IMXpulpv2
  )
 
-zephyr_sources(
- soc_irq.S
- vector.S
- pulpino_irq.c
- pulpino_idle.c
- )
+zephyr_list(SOURCES
+ OUTPUT PRIVATE_SOURCES
+ soc_irq.S
+ vector.S
+ pulpino_irq.c
+ pulpino_idle.c
+)
+
+target_sources(soc_riscv32 PRIVATE ${PRIVATE_SOURCES})
diff --git a/soc/riscv32/riscv-privilege/common/CMakeLists.txt b/soc/riscv32/riscv-privilege/common/CMakeLists.txt
@@ -1,8 +1,11 @@
 zephyr_include_directories(.)
 
-zephyr_sources(
- idle.c
- soc_irq.S
- soc_common_irq.c
- vector.S
- )
+zephyr_list(SOURCES
+ OUTPUT PRIVATE_SOURCES
+ idle.c
+ soc_irq.S
+ soc_common_irq.c
+ vector.S
+)
+
+target_sources(soc_riscv32 PRIVATE ${PRIVATE_SOURCES})
diff --git a/soc/riscv32/riscv-privilege/miv/CMakeLists.txt b/soc/riscv32/riscv-privilege/miv/CMakeLists.txt
@@ -1 +0,0 @@
-zephyr_sources()

diff --git a/soc/riscv32/riscv-privilege/sifive-freedom/CMakeLists.txt b/soc/riscv32/riscv-privilege/sifive-freedom/CMakeLists.txt
@@ -1 +0,0 @@
-zephyr_sources()