From 359133d725d27357a449c0d66fed2acfee78583e Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Wed, 14 Feb 2024 08:16:35 +0000
Subject: [PATCH] soc: efinix_sapphire: Port to HWMv2

Ports the SoC configuration to hardware model version 2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 .../efinix_sapphire => efinix/sapphire}/CMakeLists.txt |  0
 .../Kconfig.soc => efinix/sapphire/Kconfig}            |  1 -
 .../sapphire}/Kconfig.defconfig                        |  3 ---
 soc/efinix/sapphire/Kconfig.soc                        | 10 ++++++++++
 soc/efinix/sapphire/soc.yml                            |  2 ++
 5 files changed, 12 insertions(+), 4 deletions(-)
 rename soc/{soc_legacy/riscv/efinix_sapphire => efinix/sapphire}/CMakeLists.txt (100%)
 rename soc/{soc_legacy/riscv/efinix_sapphire/Kconfig.soc => efinix/sapphire/Kconfig} (86%)
 rename soc/{soc_legacy/riscv/efinix_sapphire => efinix/sapphire}/Kconfig.defconfig (88%)
 create mode 100644 soc/efinix/sapphire/Kconfig.soc
 create mode 100644 soc/efinix/sapphire/soc.yml

diff --git a/soc/soc_legacy/riscv/efinix_sapphire/CMakeLists.txt b/soc/efinix/sapphire/CMakeLists.txt
similarity index 100%
rename from soc/soc_legacy/riscv/efinix_sapphire/CMakeLists.txt
rename to soc/efinix/sapphire/CMakeLists.txt
diff --git a/soc/soc_legacy/riscv/efinix_sapphire/Kconfig.soc b/soc/efinix/sapphire/Kconfig
similarity index 86%
rename from soc/soc_legacy/riscv/efinix_sapphire/Kconfig.soc
rename to soc/efinix/sapphire/Kconfig
index 4bad3b5cb79..4617e7383c5 100644
--- a/soc/soc_legacy/riscv/efinix_sapphire/Kconfig.soc
+++ b/soc/efinix/sapphire/Kconfig
@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_EFINIX_SAPPHIRE
-	bool "Efinix Sapphire VexRiscv system implementation"
 	select ATOMIC_OPERATIONS_BUILTIN
 	select INCLUDE_RESET_VECTOR
 	select RISCV_ISA_RV32I
diff --git a/soc/soc_legacy/riscv/efinix_sapphire/Kconfig.defconfig b/soc/efinix/sapphire/Kconfig.defconfig
similarity index 88%
rename from soc/soc_legacy/riscv/efinix_sapphire/Kconfig.defconfig
rename to soc/efinix/sapphire/Kconfig.defconfig
index 95a33b4ab82..75325b2fa55 100644
--- a/soc/soc_legacy/riscv/efinix_sapphire/Kconfig.defconfig
+++ b/soc/efinix/sapphire/Kconfig.defconfig
@@ -3,9 +3,6 @@
 
 if SOC_EFINIX_SAPPHIRE
 
-config SOC
-	default "efinix_sapphire"
-
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 100000000
 
diff --git a/soc/efinix/sapphire/Kconfig.soc b/soc/efinix/sapphire/Kconfig.soc
new file mode 100644
index 00000000000..5ab00455e4a
--- /dev/null
+++ b/soc/efinix/sapphire/Kconfig.soc
@@ -0,0 +1,10 @@
+# Copyright (c) 2023 Efinix Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_EFINIX_SAPPHIRE
+	bool
+	help
+	  Efinix Sapphire VexRiscv system implementation
+
+config SOC
+	default "efinix_sapphire" if SOC_EFINIX_SAPPHIRE
diff --git a/soc/efinix/sapphire/soc.yml b/soc/efinix/sapphire/soc.yml
new file mode 100644
index 00000000000..d976114557a
--- /dev/null
+++ b/soc/efinix/sapphire/soc.yml
@@ -0,0 +1,2 @@
+socs:
+- name: efinix_sapphire