From 279cc2e44884182178db562e0ee2bebbc7c4773e Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Mon, 3 Sep 2018 16:38:52 -0500
Subject: [PATCH] riscv32: 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 <anas.nashif@intel.com>
---
 arch/riscv32/CMakeLists.txt                                   | 1 -
 arch/riscv32/Kconfig                                          | 4 ++--
 {arch/riscv32/soc => soc/riscv32}/CMakeLists.txt              | 0
 {arch/riscv32/soc => soc/riscv32}/pulpino/CMakeLists.txt      | 0
 {arch/riscv32/soc => soc/riscv32}/pulpino/Kconfig.defconfig   | 0
 {arch/riscv32/soc => soc/riscv32}/pulpino/Kconfig.soc         | 0
 {arch/riscv32/soc => soc/riscv32}/pulpino/linker.ld           | 0
 {arch/riscv32/soc => soc/riscv32}/pulpino/pulpino_idle.c      | 0
 {arch/riscv32/soc => soc/riscv32}/pulpino/pulpino_irq.c       | 0
 {arch/riscv32/soc => soc/riscv32}/pulpino/soc.h               | 0
 {arch/riscv32/soc => soc/riscv32}/pulpino/soc_irq.S           | 0
 {arch/riscv32/soc => soc/riscv32}/pulpino/vector.S            | 0
 .../soc => soc/riscv32}/riscv-privilege/CMakeLists.txt        | 0
 {arch/riscv32/soc => soc/riscv32}/riscv-privilege/Kconfig     | 2 +-
 .../soc => soc/riscv32}/riscv-privilege/Kconfig.defconfig     | 2 +-
 {arch/riscv32/soc => soc/riscv32}/riscv-privilege/Kconfig.soc | 2 +-
 .../soc => soc/riscv32}/riscv-privilege/common/CMakeLists.txt | 0
 .../riscv32/soc => soc/riscv32}/riscv-privilege/common/idle.c | 0
 .../soc => soc/riscv32}/riscv-privilege/common/soc_common.h   | 0
 .../riscv32}/riscv-privilege/common/soc_common_irq.c          | 0
 .../soc => soc/riscv32}/riscv-privilege/common/soc_irq.S      | 0
 .../soc => soc/riscv32}/riscv-privilege/common/vector.S       | 0
 .../soc => soc/riscv32}/riscv-privilege/miv/CMakeLists.txt    | 0
 .../riscv32}/riscv-privilege/miv/Kconfig.defconfig.series     | 0
 .../soc => soc/riscv32}/riscv-privilege/miv/Kconfig.series    | 0
 .../soc => soc/riscv32}/riscv-privilege/miv/Kconfig.soc       | 0
 .../riscv32/soc => soc/riscv32}/riscv-privilege/miv/linker.ld | 0
 {arch/riscv32/soc => soc/riscv32}/riscv-privilege/miv/soc.h   | 0
 .../riscv32}/riscv-privilege/riscv32-qemu/CMakeLists.txt      | 0
 .../riscv-privilege/riscv32-qemu/Kconfig.defconfig.series     | 0
 .../riscv32}/riscv-privilege/riscv32-qemu/Kconfig.series      | 0
 .../riscv32}/riscv-privilege/riscv32-qemu/Kconfig.soc         | 0
 .../riscv32}/riscv-privilege/riscv32-qemu/dts.fixup           | 0
 .../riscv32}/riscv-privilege/riscv32-qemu/linker.ld           | 0
 .../riscv32}/riscv-privilege/riscv32-qemu/qemu_irq.S          | 0
 .../soc => soc/riscv32}/riscv-privilege/riscv32-qemu/soc.h    | 0
 .../soc => soc/riscv32}/riscv-privilege/riscv32-qemu/vector.S | 0
 .../riscv32}/riscv-privilege/sifive-freedom/CMakeLists.txt    | 0
 .../riscv-privilege/sifive-freedom/Kconfig.defconfig.series   | 0
 .../riscv32}/riscv-privilege/sifive-freedom/Kconfig.series    | 0
 .../riscv32}/riscv-privilege/sifive-freedom/Kconfig.soc       | 0
 .../riscv32}/riscv-privilege/sifive-freedom/linker.ld         | 0
 .../soc => soc/riscv32}/riscv-privilege/sifive-freedom/soc.h  | 0
 43 files changed, 5 insertions(+), 6 deletions(-)
 rename {arch/riscv32/soc => soc/riscv32}/CMakeLists.txt (100%)
 rename {arch/riscv32/soc => soc/riscv32}/pulpino/CMakeLists.txt (100%)
 rename {arch/riscv32/soc => soc/riscv32}/pulpino/Kconfig.defconfig (100%)
 rename {arch/riscv32/soc => soc/riscv32}/pulpino/Kconfig.soc (100%)
 rename {arch/riscv32/soc => soc/riscv32}/pulpino/linker.ld (100%)
 rename {arch/riscv32/soc => soc/riscv32}/pulpino/pulpino_idle.c (100%)
 rename {arch/riscv32/soc => soc/riscv32}/pulpino/pulpino_irq.c (100%)
 rename {arch/riscv32/soc => soc/riscv32}/pulpino/soc.h (100%)
 rename {arch/riscv32/soc => soc/riscv32}/pulpino/soc_irq.S (100%)
 rename {arch/riscv32/soc => soc/riscv32}/pulpino/vector.S (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/CMakeLists.txt (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/Kconfig (91%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/Kconfig.defconfig (73%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/Kconfig.soc (76%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/common/CMakeLists.txt (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/common/idle.c (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/common/soc_common.h (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/common/soc_common_irq.c (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/common/soc_irq.S (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/common/vector.S (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/miv/CMakeLists.txt (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/miv/Kconfig.defconfig.series (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/miv/Kconfig.series (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/miv/Kconfig.soc (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/miv/linker.ld (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/miv/soc.h (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/riscv32-qemu/CMakeLists.txt (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/riscv32-qemu/Kconfig.defconfig.series (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/riscv32-qemu/Kconfig.series (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/riscv32-qemu/Kconfig.soc (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/riscv32-qemu/dts.fixup (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/riscv32-qemu/linker.ld (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/riscv32-qemu/qemu_irq.S (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/riscv32-qemu/soc.h (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/riscv32-qemu/vector.S (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/sifive-freedom/CMakeLists.txt (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/sifive-freedom/Kconfig.defconfig.series (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/sifive-freedom/Kconfig.series (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/sifive-freedom/Kconfig.soc (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/sifive-freedom/linker.ld (100%)
 rename {arch/riscv32/soc => soc/riscv32}/riscv-privilege/sifive-freedom/soc.h (100%)

diff --git a/arch/riscv32/CMakeLists.txt b/arch/riscv32/CMakeLists.txt
index 7e2566e191f..a902d8f6a9a 100644
--- a/arch/riscv32/CMakeLists.txt
+++ b/arch/riscv32/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(soc)
 add_subdirectory(core)
 
 set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT elf32-littleriscv)
diff --git a/arch/riscv32/Kconfig b/arch/riscv32/Kconfig
index a4b3169f877..ff06f848d67 100644
--- a/arch/riscv32/Kconfig
+++ b/arch/riscv32/Kconfig
@@ -7,7 +7,7 @@
 choice
 	prompt "RISCV32 configuration selection"
 	depends on RISCV32
-	source "arch/riscv32/soc/*/Kconfig.soc"
+	source "soc/riscv32/*/Kconfig.soc"
 endchoice
 
 menu "RISCV32 Options"
@@ -15,7 +15,7 @@ menu "RISCV32 Options"
 
 # Include these first so that any properties (e.g. defaults) below can be
 # overriden (by defining symbols in multiple locations)
-source "arch/riscv32/soc/*/Kconfig"
+source "soc/riscv32/*/Kconfig"
 
 config ARCH
 	string
diff --git a/arch/riscv32/soc/CMakeLists.txt b/soc/riscv32/CMakeLists.txt
similarity index 100%
rename from arch/riscv32/soc/CMakeLists.txt
rename to soc/riscv32/CMakeLists.txt
diff --git a/arch/riscv32/soc/pulpino/CMakeLists.txt b/soc/riscv32/pulpino/CMakeLists.txt
similarity index 100%
rename from arch/riscv32/soc/pulpino/CMakeLists.txt
rename to soc/riscv32/pulpino/CMakeLists.txt
diff --git a/arch/riscv32/soc/pulpino/Kconfig.defconfig b/soc/riscv32/pulpino/Kconfig.defconfig
similarity index 100%
rename from arch/riscv32/soc/pulpino/Kconfig.defconfig
rename to soc/riscv32/pulpino/Kconfig.defconfig
diff --git a/arch/riscv32/soc/pulpino/Kconfig.soc b/soc/riscv32/pulpino/Kconfig.soc
similarity index 100%
rename from arch/riscv32/soc/pulpino/Kconfig.soc
rename to soc/riscv32/pulpino/Kconfig.soc
diff --git a/arch/riscv32/soc/pulpino/linker.ld b/soc/riscv32/pulpino/linker.ld
similarity index 100%
rename from arch/riscv32/soc/pulpino/linker.ld
rename to soc/riscv32/pulpino/linker.ld
diff --git a/arch/riscv32/soc/pulpino/pulpino_idle.c b/soc/riscv32/pulpino/pulpino_idle.c
similarity index 100%
rename from arch/riscv32/soc/pulpino/pulpino_idle.c
rename to soc/riscv32/pulpino/pulpino_idle.c
diff --git a/arch/riscv32/soc/pulpino/pulpino_irq.c b/soc/riscv32/pulpino/pulpino_irq.c
similarity index 100%
rename from arch/riscv32/soc/pulpino/pulpino_irq.c
rename to soc/riscv32/pulpino/pulpino_irq.c
diff --git a/arch/riscv32/soc/pulpino/soc.h b/soc/riscv32/pulpino/soc.h
similarity index 100%
rename from arch/riscv32/soc/pulpino/soc.h
rename to soc/riscv32/pulpino/soc.h
diff --git a/arch/riscv32/soc/pulpino/soc_irq.S b/soc/riscv32/pulpino/soc_irq.S
similarity index 100%
rename from arch/riscv32/soc/pulpino/soc_irq.S
rename to soc/riscv32/pulpino/soc_irq.S
diff --git a/arch/riscv32/soc/pulpino/vector.S b/soc/riscv32/pulpino/vector.S
similarity index 100%
rename from arch/riscv32/soc/pulpino/vector.S
rename to soc/riscv32/pulpino/vector.S
diff --git a/arch/riscv32/soc/riscv-privilege/CMakeLists.txt b/soc/riscv32/riscv-privilege/CMakeLists.txt
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/CMakeLists.txt
rename to soc/riscv32/riscv-privilege/CMakeLists.txt
diff --git a/arch/riscv32/soc/riscv-privilege/Kconfig b/soc/riscv32/riscv-privilege/Kconfig
similarity index 91%
rename from arch/riscv32/soc/riscv-privilege/Kconfig
rename to soc/riscv32/riscv-privilege/Kconfig
index d026ff3a038..5d56a880843 100644
--- a/arch/riscv32/soc/riscv-privilege/Kconfig
+++ b/soc/riscv32/riscv-privilege/Kconfig
@@ -22,4 +22,4 @@ config RISCV_HAS_PLIC
 	  Does the SOC provide support for a Platform Level Interrupt Controller
 
 
-source "arch/riscv32/soc/riscv-privilege/*/Kconfig.soc"
+source "soc/riscv32/riscv-privilege/*/Kconfig.soc"
diff --git a/arch/riscv32/soc/riscv-privilege/Kconfig.defconfig b/soc/riscv32/riscv-privilege/Kconfig.defconfig
similarity index 73%
rename from arch/riscv32/soc/riscv-privilege/Kconfig.defconfig
rename to soc/riscv32/riscv-privilege/Kconfig.defconfig
index 365b72a7a58..88b2819e3f6 100644
--- a/arch/riscv32/soc/riscv-privilege/Kconfig.defconfig
+++ b/soc/riscv32/riscv-privilege/Kconfig.defconfig
@@ -4,4 +4,4 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-source "arch/riscv32/soc/riscv-privilege/*/Kconfig.defconfig.series"
+source "soc/riscv32/riscv-privilege/*/Kconfig.defconfig.series"
diff --git a/arch/riscv32/soc/riscv-privilege/Kconfig.soc b/soc/riscv32/riscv-privilege/Kconfig.soc
similarity index 76%
rename from arch/riscv32/soc/riscv-privilege/Kconfig.soc
rename to soc/riscv32/riscv-privilege/Kconfig.soc
index 12ee3fed8b4..87fc63fdb83 100644
--- a/arch/riscv32/soc/riscv-privilege/Kconfig.soc
+++ b/soc/riscv32/riscv-privilege/Kconfig.soc
@@ -5,4 +5,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-source "arch/riscv32/soc/riscv-privilege/*/Kconfig.series"
+source "soc/riscv32/riscv-privilege/*/Kconfig.series"
diff --git a/arch/riscv32/soc/riscv-privilege/common/CMakeLists.txt b/soc/riscv32/riscv-privilege/common/CMakeLists.txt
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/common/CMakeLists.txt
rename to soc/riscv32/riscv-privilege/common/CMakeLists.txt
diff --git a/arch/riscv32/soc/riscv-privilege/common/idle.c b/soc/riscv32/riscv-privilege/common/idle.c
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/common/idle.c
rename to soc/riscv32/riscv-privilege/common/idle.c
diff --git a/arch/riscv32/soc/riscv-privilege/common/soc_common.h b/soc/riscv32/riscv-privilege/common/soc_common.h
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/common/soc_common.h
rename to soc/riscv32/riscv-privilege/common/soc_common.h
diff --git a/arch/riscv32/soc/riscv-privilege/common/soc_common_irq.c b/soc/riscv32/riscv-privilege/common/soc_common_irq.c
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/common/soc_common_irq.c
rename to soc/riscv32/riscv-privilege/common/soc_common_irq.c
diff --git a/arch/riscv32/soc/riscv-privilege/common/soc_irq.S b/soc/riscv32/riscv-privilege/common/soc_irq.S
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/common/soc_irq.S
rename to soc/riscv32/riscv-privilege/common/soc_irq.S
diff --git a/arch/riscv32/soc/riscv-privilege/common/vector.S b/soc/riscv32/riscv-privilege/common/vector.S
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/common/vector.S
rename to soc/riscv32/riscv-privilege/common/vector.S
diff --git a/arch/riscv32/soc/riscv-privilege/miv/CMakeLists.txt b/soc/riscv32/riscv-privilege/miv/CMakeLists.txt
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/miv/CMakeLists.txt
rename to soc/riscv32/riscv-privilege/miv/CMakeLists.txt
diff --git a/arch/riscv32/soc/riscv-privilege/miv/Kconfig.defconfig.series b/soc/riscv32/riscv-privilege/miv/Kconfig.defconfig.series
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/miv/Kconfig.defconfig.series
rename to soc/riscv32/riscv-privilege/miv/Kconfig.defconfig.series
diff --git a/arch/riscv32/soc/riscv-privilege/miv/Kconfig.series b/soc/riscv32/riscv-privilege/miv/Kconfig.series
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/miv/Kconfig.series
rename to soc/riscv32/riscv-privilege/miv/Kconfig.series
diff --git a/arch/riscv32/soc/riscv-privilege/miv/Kconfig.soc b/soc/riscv32/riscv-privilege/miv/Kconfig.soc
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/miv/Kconfig.soc
rename to soc/riscv32/riscv-privilege/miv/Kconfig.soc
diff --git a/arch/riscv32/soc/riscv-privilege/miv/linker.ld b/soc/riscv32/riscv-privilege/miv/linker.ld
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/miv/linker.ld
rename to soc/riscv32/riscv-privilege/miv/linker.ld
diff --git a/arch/riscv32/soc/riscv-privilege/miv/soc.h b/soc/riscv32/riscv-privilege/miv/soc.h
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/miv/soc.h
rename to soc/riscv32/riscv-privilege/miv/soc.h
diff --git a/arch/riscv32/soc/riscv-privilege/riscv32-qemu/CMakeLists.txt b/soc/riscv32/riscv-privilege/riscv32-qemu/CMakeLists.txt
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/riscv32-qemu/CMakeLists.txt
rename to soc/riscv32/riscv-privilege/riscv32-qemu/CMakeLists.txt
diff --git a/arch/riscv32/soc/riscv-privilege/riscv32-qemu/Kconfig.defconfig.series b/soc/riscv32/riscv-privilege/riscv32-qemu/Kconfig.defconfig.series
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/riscv32-qemu/Kconfig.defconfig.series
rename to soc/riscv32/riscv-privilege/riscv32-qemu/Kconfig.defconfig.series
diff --git a/arch/riscv32/soc/riscv-privilege/riscv32-qemu/Kconfig.series b/soc/riscv32/riscv-privilege/riscv32-qemu/Kconfig.series
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/riscv32-qemu/Kconfig.series
rename to soc/riscv32/riscv-privilege/riscv32-qemu/Kconfig.series
diff --git a/arch/riscv32/soc/riscv-privilege/riscv32-qemu/Kconfig.soc b/soc/riscv32/riscv-privilege/riscv32-qemu/Kconfig.soc
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/riscv32-qemu/Kconfig.soc
rename to soc/riscv32/riscv-privilege/riscv32-qemu/Kconfig.soc
diff --git a/arch/riscv32/soc/riscv-privilege/riscv32-qemu/dts.fixup b/soc/riscv32/riscv-privilege/riscv32-qemu/dts.fixup
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/riscv32-qemu/dts.fixup
rename to soc/riscv32/riscv-privilege/riscv32-qemu/dts.fixup
diff --git a/arch/riscv32/soc/riscv-privilege/riscv32-qemu/linker.ld b/soc/riscv32/riscv-privilege/riscv32-qemu/linker.ld
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/riscv32-qemu/linker.ld
rename to soc/riscv32/riscv-privilege/riscv32-qemu/linker.ld
diff --git a/arch/riscv32/soc/riscv-privilege/riscv32-qemu/qemu_irq.S b/soc/riscv32/riscv-privilege/riscv32-qemu/qemu_irq.S
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/riscv32-qemu/qemu_irq.S
rename to soc/riscv32/riscv-privilege/riscv32-qemu/qemu_irq.S
diff --git a/arch/riscv32/soc/riscv-privilege/riscv32-qemu/soc.h b/soc/riscv32/riscv-privilege/riscv32-qemu/soc.h
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/riscv32-qemu/soc.h
rename to soc/riscv32/riscv-privilege/riscv32-qemu/soc.h
diff --git a/arch/riscv32/soc/riscv-privilege/riscv32-qemu/vector.S b/soc/riscv32/riscv-privilege/riscv32-qemu/vector.S
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/riscv32-qemu/vector.S
rename to soc/riscv32/riscv-privilege/riscv32-qemu/vector.S
diff --git a/arch/riscv32/soc/riscv-privilege/sifive-freedom/CMakeLists.txt b/soc/riscv32/riscv-privilege/sifive-freedom/CMakeLists.txt
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/sifive-freedom/CMakeLists.txt
rename to soc/riscv32/riscv-privilege/sifive-freedom/CMakeLists.txt
diff --git a/arch/riscv32/soc/riscv-privilege/sifive-freedom/Kconfig.defconfig.series b/soc/riscv32/riscv-privilege/sifive-freedom/Kconfig.defconfig.series
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/sifive-freedom/Kconfig.defconfig.series
rename to soc/riscv32/riscv-privilege/sifive-freedom/Kconfig.defconfig.series
diff --git a/arch/riscv32/soc/riscv-privilege/sifive-freedom/Kconfig.series b/soc/riscv32/riscv-privilege/sifive-freedom/Kconfig.series
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/sifive-freedom/Kconfig.series
rename to soc/riscv32/riscv-privilege/sifive-freedom/Kconfig.series
diff --git a/arch/riscv32/soc/riscv-privilege/sifive-freedom/Kconfig.soc b/soc/riscv32/riscv-privilege/sifive-freedom/Kconfig.soc
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/sifive-freedom/Kconfig.soc
rename to soc/riscv32/riscv-privilege/sifive-freedom/Kconfig.soc
diff --git a/arch/riscv32/soc/riscv-privilege/sifive-freedom/linker.ld b/soc/riscv32/riscv-privilege/sifive-freedom/linker.ld
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/sifive-freedom/linker.ld
rename to soc/riscv32/riscv-privilege/sifive-freedom/linker.ld
diff --git a/arch/riscv32/soc/riscv-privilege/sifive-freedom/soc.h b/soc/riscv32/riscv-privilege/sifive-freedom/soc.h
similarity index 100%
rename from arch/riscv32/soc/riscv-privilege/sifive-freedom/soc.h
rename to soc/riscv32/riscv-privilege/sifive-freedom/soc.h