nios2: move soc to top-level dir soc/

Move the SoC outside of the architecture tree and put them at the same level as boards and architectures allowing both SoCs and boards to be maintained outside the tree. Signed-off-by: Anas Nashif <[email protected]>
k0d · Sep 13, 2018 · 696aa86 · 696aa86
1 parent 279cc2e
commit 696aa86
Show file tree

Hide file tree

Showing 29 changed files with 5 additions and 6 deletions.
diff --git a/arch/nios2/CMakeLists.txt b/arch/nios2/CMakeLists.txt
@@ -32,5 +32,4 @@ else()
 zephyr_cc_option(-mno-hw-div)
 endif()
 
-add_subdirectory(soc/${SOC_PATH})
 add_subdirectory(core)
diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
@@ -7,7 +7,7 @@
 choice
 	prompt "Nios II configuration selection"
 	depends on NIOS2
-	source "arch/nios2/soc/*/Kconfig.soc"
+	source "soc/nios2/*/Kconfig.soc"
 endchoice
 
 menu "Nios II Options"
@@ -17,7 +17,7 @@ menu "Nios II Options"
 # overriden (by defining symbols in multiple locations)
 #
 # (No SoC-specific Kconfig files as of writing, hence the optional source.)
-osource "arch/nios2/soc/*/Kconfig"
+osource "soc/nios2/*/Kconfig"
 
 config ARCH
 	string

diff --git a/boards/nios2/altera_max10/board.cmake b/boards/nios2/altera_max10/board.cmake
@@ -1,2 +1,2 @@
-board_runner_args(nios2 "--cpu-sof=${ZEPHYR_BASE}/arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da.sof")
+board_runner_args(nios2 "--cpu-sof=${ZEPHYR_BASE}/soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.sof")
 include(${ZEPHYR_BASE}/boards/common/nios2.board.cmake)
diff --git a/boards/nios2/altera_max10/doc/board.rst b/boards/nios2/altera_max10/doc/board.rst
@@ -94,11 +94,11 @@ Reference CPU
 =============
 
 A reference CPU design of a Nios II/f core is included in the Zephyr tree
-in the :file:`arch/nios2/soc/nios2f-zephyr/cpu` directory.
+in the :file:`soc/nios2/nios2f-zephyr/cpu` directory.
 
 Flash this CPU using the ``nios2-configure-sof`` SDK tool with the FPGA
 configuration file
-:file:`arch/nios2/soc/nios2f-zephyr/cpu/ghrd_10m50da.sof`:
+:file:`soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.sof`:
 
 .. code-block:: console
 

diff --git a/arch/nios2/soc/nios2-qemu/CMakeLists.txt → soc/nios2/nios2-qemu/CMakeLists.txt b/arch/nios2/soc/nios2-qemu/CMakeLists.txt → soc/nios2/nios2-qemu/CMakeLists.txt
diff --git a/arch/nios2/soc/nios2-qemu/Kconfig.defconfig → soc/nios2/nios2-qemu/Kconfig.defconfig b/arch/nios2/soc/nios2-qemu/Kconfig.defconfig → soc/nios2/nios2-qemu/Kconfig.defconfig
diff --git a/arch/nios2/soc/nios2-qemu/Kconfig.soc → soc/nios2/nios2-qemu/Kconfig.soc b/arch/nios2/soc/nios2-qemu/Kconfig.soc → soc/nios2/nios2-qemu/Kconfig.soc
diff --git a/arch/nios2/soc/nios2-qemu/dts.fixup → soc/nios2/nios2-qemu/dts.fixup b/arch/nios2/soc/nios2-qemu/dts.fixup → soc/nios2/nios2-qemu/dts.fixup
diff --git a/arch/nios2/soc/nios2-qemu/include/layout.h → soc/nios2/nios2-qemu/include/layout.h b/arch/nios2/soc/nios2-qemu/include/layout.h → soc/nios2/nios2-qemu/include/layout.h
diff --git a/arch/nios2/soc/nios2-qemu/include/linker.h → soc/nios2/nios2-qemu/include/linker.h b/arch/nios2/soc/nios2-qemu/include/linker.h → soc/nios2/nios2-qemu/include/linker.h
diff --git a/arch/nios2/soc/nios2-qemu/include/system.h → soc/nios2/nios2-qemu/include/system.h b/arch/nios2/soc/nios2-qemu/include/system.h → soc/nios2/nios2-qemu/include/system.h
diff --git a/arch/nios2/soc/nios2-qemu/linker.ld → soc/nios2/nios2-qemu/linker.ld b/arch/nios2/soc/nios2-qemu/linker.ld → soc/nios2/nios2-qemu/linker.ld
diff --git a/arch/nios2/soc/nios2f-zephyr/CMakeLists.txt → soc/nios2/nios2f-zephyr/CMakeLists.txt b/arch/nios2/soc/nios2f-zephyr/CMakeLists.txt → soc/nios2/nios2f-zephyr/CMakeLists.txt
diff --git a/...nios2/soc/nios2f-zephyr/Kconfig.defconfig → soc/nios2/nios2f-zephyr/Kconfig.defconfig b/...nios2/soc/nios2f-zephyr/Kconfig.defconfig → soc/nios2/nios2f-zephyr/Kconfig.defconfig
diff --git a/arch/nios2/soc/nios2f-zephyr/Kconfig.soc → soc/nios2/nios2f-zephyr/Kconfig.soc b/arch/nios2/soc/nios2f-zephyr/Kconfig.soc → soc/nios2/nios2f-zephyr/Kconfig.soc
diff --git a/arch/nios2/soc/nios2f-zephyr/cpu/README → soc/nios2/nios2f-zephyr/cpu/README b/arch/nios2/soc/nios2f-zephyr/cpu/README → soc/nios2/nios2f-zephyr/cpu/README
diff --git a/...s2/soc/nios2f-zephyr/cpu/ghrd_10m50da.qpf → soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.qpf b/...s2/soc/nios2f-zephyr/cpu/ghrd_10m50da.qpf → soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.qpf
diff --git a/...s2/soc/nios2f-zephyr/cpu/ghrd_10m50da.qsf → soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.qsf b/...s2/soc/nios2f-zephyr/cpu/ghrd_10m50da.qsf → soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.qsf
diff --git a/...2/soc/nios2f-zephyr/cpu/ghrd_10m50da.qsys → ...nios2/nios2f-zephyr/cpu/ghrd_10m50da.qsys b/...2/soc/nios2f-zephyr/cpu/ghrd_10m50da.qsys → ...nios2/nios2f-zephyr/cpu/ghrd_10m50da.qsys
diff --git a/...s2/soc/nios2f-zephyr/cpu/ghrd_10m50da.sof → soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.sof b/...s2/soc/nios2f-zephyr/cpu/ghrd_10m50da.sof → soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.sof
diff --git a/...c/nios2f-zephyr/cpu/ghrd_10m50da.sopcinfo → ...2/nios2f-zephyr/cpu/ghrd_10m50da.sopcinfo b/...c/nios2f-zephyr/cpu/ghrd_10m50da.sopcinfo → ...2/nios2f-zephyr/cpu/ghrd_10m50da.sopcinfo
diff --git a/.../soc/nios2f-zephyr/cpu/ghrd_10m50da_top.v → ...ios2/nios2f-zephyr/cpu/ghrd_10m50da_top.v b/.../soc/nios2f-zephyr/cpu/ghrd_10m50da_top.v → ...ios2/nios2f-zephyr/cpu/ghrd_10m50da_top.v
diff --git a/...os2/soc/nios2f-zephyr/cpu/ghrd_timing.sdc → soc/nios2/nios2f-zephyr/cpu/ghrd_timing.sdc b/...os2/soc/nios2f-zephyr/cpu/ghrd_timing.sdc → soc/nios2/nios2f-zephyr/cpu/ghrd_timing.sdc
diff --git a/arch/nios2/soc/nios2f-zephyr/dts.fixup → soc/nios2/nios2f-zephyr/dts.fixup b/arch/nios2/soc/nios2f-zephyr/dts.fixup → soc/nios2/nios2f-zephyr/dts.fixup
diff --git a/.../nios2/soc/nios2f-zephyr/include/layout.h → soc/nios2/nios2f-zephyr/include/layout.h b/.../nios2/soc/nios2f-zephyr/include/layout.h → soc/nios2/nios2f-zephyr/include/layout.h
diff --git a/.../nios2/soc/nios2f-zephyr/include/linker.h → soc/nios2/nios2f-zephyr/include/linker.h b/.../nios2/soc/nios2f-zephyr/include/linker.h → soc/nios2/nios2f-zephyr/include/linker.h
diff --git a/.../nios2/soc/nios2f-zephyr/include/system.h → soc/nios2/nios2f-zephyr/include/system.h b/.../nios2/soc/nios2f-zephyr/include/system.h → soc/nios2/nios2f-zephyr/include/system.h
diff --git a/arch/nios2/soc/nios2f-zephyr/linker.ld → soc/nios2/nios2f-zephyr/linker.ld b/arch/nios2/soc/nios2f-zephyr/linker.ld → soc/nios2/nios2f-zephyr/linker.ld
diff --git a/arch/nios2/soc/nios2f-zephyr/soc.h → soc/nios2/nios2f-zephyr/soc.h b/arch/nios2/soc/nios2f-zephyr/soc.h → soc/nios2/nios2f-zephyr/soc.h