From 1532f2fee1df89fd05aa02e17bd4e090e3c77904 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Mon, 19 Feb 2024 12:56:53 +0000
Subject: [PATCH] soc: ti_lm3s6965: Port to HWMv2

Ports the SoC configuration to hardware model version 2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 .../arm/ti_lm3s6965 => ti/lm3s6965}/CMakeLists.txt     |  2 ++
 .../ti_lm3s6965/Kconfig.soc => ti/lm3s6965/Kconfig}    |  2 +-
 .../arm/ti_lm3s6965 => ti/lm3s6965}/Kconfig.defconfig  |  3 ---
 .../ti_lm3s6965/Kconfig => ti/lm3s6965/Kconfig.soc}    | 10 ++++++++--
 .../arm/ti_lm3s6965 => ti/lm3s6965}/reboot.S           |  0
 soc/{soc_legacy/arm/ti_lm3s6965 => ti/lm3s6965}/soc.h  |  0
 soc/ti/lm3s6965/soc.yml                                |  2 ++
 .../arm/ti_lm3s6965 => ti/lm3s6965}/soc_config.c       |  0
 .../arm/ti_lm3s6965 => ti/lm3s6965}/sys_arch_reboot.c  |  0
 9 files changed, 13 insertions(+), 6 deletions(-)
 rename soc/{soc_legacy/arm/ti_lm3s6965 => ti/lm3s6965}/CMakeLists.txt (91%)
 rename soc/{soc_legacy/arm/ti_lm3s6965/Kconfig.soc => ti/lm3s6965/Kconfig} (71%)
 rename soc/{soc_legacy/arm/ti_lm3s6965 => ti/lm3s6965}/Kconfig.defconfig (93%)
 rename soc/{soc_legacy/arm/ti_lm3s6965/Kconfig => ti/lm3s6965/Kconfig.soc} (72%)
 rename soc/{soc_legacy/arm/ti_lm3s6965 => ti/lm3s6965}/reboot.S (100%)
 rename soc/{soc_legacy/arm/ti_lm3s6965 => ti/lm3s6965}/soc.h (100%)
 create mode 100644 soc/ti/lm3s6965/soc.yml
 rename soc/{soc_legacy/arm/ti_lm3s6965 => ti/lm3s6965}/soc_config.c (100%)
 rename soc/{soc_legacy/arm/ti_lm3s6965 => ti/lm3s6965}/sys_arch_reboot.c (100%)

diff --git a/soc/soc_legacy/arm/ti_lm3s6965/CMakeLists.txt b/soc/ti/lm3s6965/CMakeLists.txt
similarity index 91%
rename from soc/soc_legacy/arm/ti_lm3s6965/CMakeLists.txt
rename to soc/ti/lm3s6965/CMakeLists.txt
index c76906ff5c3..b490726e507 100644
--- a/soc/soc_legacy/arm/ti_lm3s6965/CMakeLists.txt
+++ b/soc/ti/lm3s6965/CMakeLists.txt
@@ -13,4 +13,6 @@ zephyr_library_include_directories(
   ${ZEPHYR_BASE}/arch/arm/include
   )
 
+zephyr_include_directories(.)
+
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
diff --git a/soc/soc_legacy/arm/ti_lm3s6965/Kconfig.soc b/soc/ti/lm3s6965/Kconfig
similarity index 71%
rename from soc/soc_legacy/arm/ti_lm3s6965/Kconfig.soc
rename to soc/ti/lm3s6965/Kconfig
index e37f9868dac..16a9c5c083f 100644
--- a/soc/soc_legacy/arm/ti_lm3s6965/Kconfig.soc
+++ b/soc/ti/lm3s6965/Kconfig
@@ -1,7 +1,7 @@
+# Copyright (c) 2014-2015 Wind River Systems, Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_TI_LM3S6965
-	bool "TI LM3S6965"
 	select ARM
 	select CPU_CORTEX_M3
 	select CPU_CORTEX_M_HAS_DWT
diff --git a/soc/soc_legacy/arm/ti_lm3s6965/Kconfig.defconfig b/soc/ti/lm3s6965/Kconfig.defconfig
similarity index 93%
rename from soc/soc_legacy/arm/ti_lm3s6965/Kconfig.defconfig
rename to soc/ti/lm3s6965/Kconfig.defconfig
index 6c8a17a15f4..097a4969c37 100644
--- a/soc/soc_legacy/arm/ti_lm3s6965/Kconfig.defconfig
+++ b/soc/ti/lm3s6965/Kconfig.defconfig
@@ -5,9 +5,6 @@
 
 if SOC_TI_LM3S6965
 
-config SOC
-	default "ti_lm3s6965"
-
 config NUM_IRQS
 	# must be >= the highest interrupt number used
 	# - include the UART interrupts and ethernet interrupts
diff --git a/soc/soc_legacy/arm/ti_lm3s6965/Kconfig b/soc/ti/lm3s6965/Kconfig.soc
similarity index 72%
rename from soc/soc_legacy/arm/ti_lm3s6965/Kconfig
rename to soc/ti/lm3s6965/Kconfig.soc
index dd181a943cb..dc1da3fa35b 100644
--- a/soc/soc_legacy/arm/ti_lm3s6965/Kconfig
+++ b/soc/ti/lm3s6965/Kconfig.soc
@@ -1,10 +1,16 @@
-# TI LM3S6965 platform configuration options
-
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
 # SPDX-License-Identifier: Apache-2.0
 
+config SOC_TI_LM3S6965
+	bool
+	help
+	  TI LM3S6965
+
 config SOC_TI_LM3S6965_QEMU
 	def_bool y
 	depends on SOC_TI_LM3S6965
 	# Platform has only been tested on QEMU, not on real hardware, so always
 	# assume it is used for a QEMU target.
+
+config SOC
+	default "ti_lm3s6965" if SOC_TI_LM3S6965
diff --git a/soc/soc_legacy/arm/ti_lm3s6965/reboot.S b/soc/ti/lm3s6965/reboot.S
similarity index 100%
rename from soc/soc_legacy/arm/ti_lm3s6965/reboot.S
rename to soc/ti/lm3s6965/reboot.S
diff --git a/soc/soc_legacy/arm/ti_lm3s6965/soc.h b/soc/ti/lm3s6965/soc.h
similarity index 100%
rename from soc/soc_legacy/arm/ti_lm3s6965/soc.h
rename to soc/ti/lm3s6965/soc.h
diff --git a/soc/ti/lm3s6965/soc.yml b/soc/ti/lm3s6965/soc.yml
new file mode 100644
index 00000000000..6f80cd356af
--- /dev/null
+++ b/soc/ti/lm3s6965/soc.yml
@@ -0,0 +1,2 @@
+socs:
+- name: ti_lm3s6965
diff --git a/soc/soc_legacy/arm/ti_lm3s6965/soc_config.c b/soc/ti/lm3s6965/soc_config.c
similarity index 100%
rename from soc/soc_legacy/arm/ti_lm3s6965/soc_config.c
rename to soc/ti/lm3s6965/soc_config.c
diff --git a/soc/soc_legacy/arm/ti_lm3s6965/sys_arch_reboot.c b/soc/ti/lm3s6965/sys_arch_reboot.c
similarity index 100%
rename from soc/soc_legacy/arm/ti_lm3s6965/sys_arch_reboot.c
rename to soc/ti/lm3s6965/sys_arch_reboot.c