soc: x86: intel_ish: move and convert to HWMv2

Move and convert soc/x86/intel_ish to HWMv2 as soc/intel/intel_ish

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>

soc/intel/intel_ish/Kconfig

@@ -1,11 +1,10 @@
 # Intel ISH family configuration options
 #
-# Copyright (c) 2023 Intel Corporation
+# Copyright (c) 2023-2024 Intel Corporation
 #
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_FAMILY_INTEL_ISH
-	bool "Intel ISH SoC family"
 	select X86
 	select X86_NO_SPECULATIVE_VULNERABILITIES
 	select IOAPIC

soc/intel/intel_ish/Kconfig.defconfig

@@ -1,6 +1,6 @@
 # Intel ISH family default configuration options
 #
-# Copyright (c) 2023 Intel Corporation
+# Copyright (c) 2023-2024 Intel Corporation
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -9,10 +9,6 @@ if SOC_FAMILY_INTEL_ISH
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 32768 if HPET_TIMER
 
-config SOC_FAMILY
-	string
-	default "intel_ish"
-
 config X86_VERY_EARLY_CONSOLE
 	default n
 
@@ -25,6 +21,6 @@ config SRAM_OFFSET
 config X86_PC_COMPATIBLE
 	default n
 
-endif # SOC_FAMILY_INTEL_ISH
-
 rsource "*/Kconfig.defconfig.series"
+
+endif # SOC_FAMILY_INTEL_ISH

soc/intel/intel_ish/Kconfig.soc

@@ -0,0 +1,13 @@
+# Intel ISH family selection
+#
+# Copyright (c) 2023-2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_FAMILY_INTEL_ISH
+	bool
+
+config SOC_FAMILY
+	default "intel_ish" if SOC_FAMILY_INTEL_ISH
+
+rsource "*/Kconfig.soc"

soc/intel/intel_ish/intel_ish5/CMakeLists.txt

@@ -1,8 +1,10 @@
-# Copyright (c) 2023 Intel Corporation
+# Copyright (c) 2023-2024 Intel Corporation
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
+zephyr_include_directories(.)
+
 zephyr_cc_option(-march=pentium -mtune=i486)
 
 zephyr_sources(soc.c)

soc/intel/intel_ish/intel_ish5/Kconfig.defconfig.series

@@ -0,0 +1,10 @@
+# Copyright (c) 2023-2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if SOC_SERIES_INTEL_ISH5
+
+rsource "pm/Kconfig.pm"
+
+endif # SOC_SERIES_INTEL_ISH5

soc/intel/intel_ish/intel_ish5/Kconfig.soc

@@ -0,0 +1,27 @@
+# Copyright (c) 2023-2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_INTEL_ISH5
+	bool
+	select SOC_FAMILY_INTEL_ISH
+
+config SOC_SERIES
+	default "intel_ish5" if SOC_SERIES_INTEL_ISH5
+
+config SOC_INTEL_ISH_5_4_1
+	bool
+	select SOC_SERIES_INTEL_ISH5
+
+config SOC_INTEL_ISH_5_6_0
+	bool
+	select SOC_SERIES_INTEL_ISH5
+
+config SOC_INTEL_ISH_5_8_0
+	bool
+	select SOC_SERIES_INTEL_ISH5
+
+config SOC
+	default "intel_ish_5_4_1" if SOC_INTEL_ISH_5_4_1
+	default "intel_ish_5_6_0" if SOC_INTEL_ISH_5_6_0
+	default "intel_ish_5_8_0" if SOC_INTEL_ISH_5_8_0

soc/intel/intel_ish/soc.yml

@@ -0,0 +1,8 @@
+family:
+  - name: intel_ish
+    series:
+      - name: intel_ish5
+        socs:
+          - name: intel_ish_5_4_1
+          - name: intel_ish_5_6_0
+          - name: intel_ish_5_8_0

soc/soc_legacy/x86/intel_ish/Kconfig.soc

@@ -1,8 +0,0 @@
-# Intel ISH family selection
-#
-# Copyright (c) 2023 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-rsource "*/Kconfig.series"
-rsource "*/Kconfig.soc"

soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.defconfig.series

@@ -1,20 +0,0 @@
-# Copyright (c) 2023 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-if SOC_SERIES_INTEL_ISH5
-
-config SOC_SERIES
-	string
-	default "intel_ish5"
-
-config SOC
-	string
-	default "intel_ish_5_4_1" if SOC_INTEL_ISH_5_4_1
-	default "intel_ish_5_6_0" if SOC_INTEL_ISH_5_6_0
-	default "intel_ish_5_8_0" if SOC_INTEL_ISH_5_8_0
-
-endif # SOC_SERIES_INTEL_ISH5
-
-rsource "pm/Kconfig.pm"

soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.series

@@ -1,8 +0,0 @@
-# Copyright (c) 2023 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config SOC_SERIES_INTEL_ISH5
-	bool "Intel ISH5 SoC"
-	select SOC_FAMILY_INTEL_ISH

soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.soc

@@ -1,19 +0,0 @@
-# Copyright (c) 2023 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-choice
-	prompt "Intel ISH5 SoCs"
-	depends on SOC_SERIES_INTEL_ISH5
-
-config SOC_INTEL_ISH_5_4_1
-	bool "Intel ISH 5.4.1 SoC"
-
-config SOC_INTEL_ISH_5_6_0
-	bool "Intel ISH 5.6.0 SoC"
-
-config SOC_INTEL_ISH_5_8_0
-	bool "Intel ISH 5.8.0 SoC"
-
-endchoice