From cab924cbfb66ea69498a5d27ab10aa9a50cd6a7d Mon Sep 17 00:00:00 2001
From: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
Date: Mon, 5 Feb 2024 12:15:01 +0100
Subject: [PATCH] soc: x86: ia32: move and convert to HWMv2

Move and convert soc/x86/ia32 to HWMv2.

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
---
 soc/{soc_legacy/x86 => }/ia32/CMakeLists.txt          | 2 ++
 soc/{soc_legacy/x86/ia32/Kconfig.soc => ia32/Kconfig} | 1 -
 soc/{soc_legacy/x86 => }/ia32/Kconfig.defconfig       | 5 ++---
 soc/ia32/Kconfig.soc                                  | 9 +++++++++
 soc/{soc_legacy/x86 => }/ia32/linker.ld               | 0
 soc/{soc_legacy/x86 => }/ia32/soc.h                   | 0
 soc/ia32/soc.yml                                      | 3 +++
 7 files changed, 16 insertions(+), 4 deletions(-)
 rename soc/{soc_legacy/x86 => }/ia32/CMakeLists.txt (79%)
 rename soc/{soc_legacy/x86/ia32/Kconfig.soc => ia32/Kconfig} (88%)
 rename soc/{soc_legacy/x86 => }/ia32/Kconfig.defconfig (84%)
 create mode 100644 soc/ia32/Kconfig.soc
 rename soc/{soc_legacy/x86 => }/ia32/linker.ld (100%)
 rename soc/{soc_legacy/x86 => }/ia32/soc.h (100%)
 create mode 100644 soc/ia32/soc.yml

diff --git a/soc/soc_legacy/x86/ia32/CMakeLists.txt b/soc/ia32/CMakeLists.txt
similarity index 79%
rename from soc/soc_legacy/x86/ia32/CMakeLists.txt
rename to soc/ia32/CMakeLists.txt
index 66d55c6ba96..e0cae8af244 100644
--- a/soc/soc_legacy/x86/ia32/CMakeLists.txt
+++ b/soc/ia32/CMakeLists.txt
@@ -1,3 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
+zephyr_include_directories(.)
+
 set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "")
diff --git a/soc/soc_legacy/x86/ia32/Kconfig.soc b/soc/ia32/Kconfig
similarity index 88%
rename from soc/soc_legacy/x86/ia32/Kconfig.soc
rename to soc/ia32/Kconfig
index d2731afdba3..7bff7f39844 100644
--- a/soc/soc_legacy/x86/ia32/Kconfig.soc
+++ b/soc/ia32/Kconfig
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_IA32
-	bool "Generic IA32 SoC"
 	select X86
 	select CPU_ATOM
 	select X86_CPU_HAS_MMX
diff --git a/soc/soc_legacy/x86/ia32/Kconfig.defconfig b/soc/ia32/Kconfig.defconfig
similarity index 84%
rename from soc/soc_legacy/x86/ia32/Kconfig.defconfig
rename to soc/ia32/Kconfig.defconfig
index 87600183a20..ccceae5b170 100644
--- a/soc/soc_legacy/x86/ia32/Kconfig.defconfig
+++ b/soc/ia32/Kconfig.defconfig
@@ -1,13 +1,12 @@
 # Generic PC platform configuration options
 
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
+# Copyright (c) 2024 Intel Corporation
+#
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_IA32
 
-config SOC
-	default "ia32"
-
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 25000000  if HPET_TIMER
 
diff --git a/soc/ia32/Kconfig.soc b/soc/ia32/Kconfig.soc
new file mode 100644
index 00000000000..db54380b43f
--- /dev/null
+++ b/soc/ia32/Kconfig.soc
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_IA32
+	bool
+
+config SOC
+	default "ia32" if SOC_IA32
diff --git a/soc/soc_legacy/x86/ia32/linker.ld b/soc/ia32/linker.ld
similarity index 100%
rename from soc/soc_legacy/x86/ia32/linker.ld
rename to soc/ia32/linker.ld
diff --git a/soc/soc_legacy/x86/ia32/soc.h b/soc/ia32/soc.h
similarity index 100%
rename from soc/soc_legacy/x86/ia32/soc.h
rename to soc/ia32/soc.h
diff --git a/soc/ia32/soc.yml b/soc/ia32/soc.yml
new file mode 100644
index 00000000000..bdc1ac372c2
--- /dev/null
+++ b/soc/ia32/soc.yml
@@ -0,0 +1,3 @@
+comment: "Generic IA32 SoC"
+socs:
+- name: ia32