zephyrproject-rtos · nordicjm · Feb 19, 2024 · Feb 5, 2024 · Feb 5, 2024 · Feb 16, 2024
diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
@@ -3227,8 +3227,8 @@ Intel Platforms (ISH):
     - teburd
     - likongintel
   files:
-    - boards/x86/intel_ish/
-    - soc/x86/intel_ish/
+    - boards/intel/intel_ish/
+    - soc/intel/intel_ish/
     - dts/x86/intel/intel_ish*
     - dts/bindings/*/intel,sedi*
     - drivers/*/*sedi*

diff --git a/boards/boards_legacy/x86/intel_ish/Kconfig.board b/boards/boards_legacy/x86/intel_ish/Kconfig.board
diff --git a/boards/boards_legacy/x86/intel_ish/Kconfig.defconfig b/boards/boards_legacy/x86/intel_ish/Kconfig.defconfig
diff --git a/boards/boards_legacy/x86/intel_ish/intel_ish_5_4_1_defconfig b/boards/boards_legacy/x86/intel_ish/intel_ish_5_4_1_defconfig
diff --git a/boards/boards_legacy/x86/intel_ish/intel_ish_5_6_0_defconfig b/boards/boards_legacy/x86/intel_ish/intel_ish_5_6_0_defconfig
diff --git a/boards/boards_legacy/x86/intel_ish/intel_ish_5_8_0_defconfig b/boards/boards_legacy/x86/intel_ish/intel_ish_5_8_0_defconfig
diff --git a/boards/intel/intel_ish/Kconfig.defconfig b/boards/intel/intel_ish/Kconfig.defconfig
@@ -0,0 +1,12 @@
+# Copyright (c) 2023 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if TEST
+config TEST_EXTRA_STACK_SIZE
+	default 1024
+endif # TEST
+
+config SYS_CLOCK_TICKS_PER_SEC
+	default 2048 if HPET_TIMER # HPET is 32768 HZ
diff --git a/boards/intel/intel_ish/Kconfig.intel_ish_5_4_1 b/boards/intel/intel_ish/Kconfig.intel_ish_5_4_1
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_INTEL_ISH_5_4_1
+	select SOC_INTEL_ISH_5_4_1
diff --git a/boards/intel/intel_ish/Kconfig.intel_ish_5_6_0 b/boards/intel/intel_ish/Kconfig.intel_ish_5_6_0
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_INTEL_ISH_5_6_0
+	select SOC_INTEL_ISH_5_6_0
diff --git a/boards/intel/intel_ish/Kconfig.intel_ish_5_8_0 b/boards/intel/intel_ish/Kconfig.intel_ish_5_8_0
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_INTEL_ISH_5_8_0
+	select SOC_INTEL_ISH_5_8_0
diff --git a/boards/intel/intel_ish/board.yml b/boards/intel/intel_ish/board.yml
@@ -0,0 +1,16 @@
+boards:
+
+  - name: intel_ish_5_4_1
+    vendor: intel
+    socs:
+      - name: intel_ish_5_4_1
+
+  - name: intel_ish_5_6_0
+    vendor: intel
+    socs:
+      - name: intel_ish_5_6_0
+
+  - name: intel_ish_5_8_0
+    vendor: intel
+    socs:
+      - name: intel_ish_5_8_0
diff --git a/...boards_legacy/x86/intel_ish/doc/index.rst → boards/intel/intel_ish/doc/index.rst b/...boards_legacy/x86/intel_ish/doc/index.rst → boards/intel/intel_ish/doc/index.rst
@@ -21,7 +21,7 @@ Hardware
 - Interface-to-Sensor peripherals (I2C, SPI, UART, I3C, GPIO, DMA).
 - Inter Process Communications (IPC) to core processor and other IP processors.
 
-.. include:: ../../../../../soc/soc_legacy/x86/intel_ish/doc/supported_features.txt
+.. include:: ../../../../soc/intel/intel_ish/doc/supported_features.txt
 
 Programming and Debugging
 *************************

diff --git a/..._legacy/x86/intel_ish/intel_ish_5_4_1.dts → boards/intel/intel_ish/intel_ish_5_4_1.dts b/..._legacy/x86/intel_ish/intel_ish_5_4_1.dts → boards/intel/intel_ish/intel_ish_5_4_1.dts
diff --git a/...legacy/x86/intel_ish/intel_ish_5_4_1.yaml → boards/intel/intel_ish/intel_ish_5_4_1.yaml b/...legacy/x86/intel_ish/intel_ish_5_4_1.yaml → boards/intel/intel_ish/intel_ish_5_4_1.yaml
diff --git a/boards/intel/intel_ish/intel_ish_5_4_1_defconfig b/boards/intel/intel_ish/intel_ish_5_4_1_defconfig
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2023-2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# uart & console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_SERIAL=y
diff --git a/..._legacy/x86/intel_ish/intel_ish_5_6_0.dts → boards/intel/intel_ish/intel_ish_5_6_0.dts b/..._legacy/x86/intel_ish/intel_ish_5_6_0.dts → boards/intel/intel_ish/intel_ish_5_6_0.dts
diff --git a/...legacy/x86/intel_ish/intel_ish_5_6_0.yaml → boards/intel/intel_ish/intel_ish_5_6_0.yaml b/...legacy/x86/intel_ish/intel_ish_5_6_0.yaml → boards/intel/intel_ish/intel_ish_5_6_0.yaml
diff --git a/boards/intel/intel_ish/intel_ish_5_6_0_defconfig b/boards/intel/intel_ish/intel_ish_5_6_0_defconfig
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2023-2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# uart & console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_SERIAL=y
diff --git a/..._legacy/x86/intel_ish/intel_ish_5_8_0.dts → boards/intel/intel_ish/intel_ish_5_8_0.dts b/..._legacy/x86/intel_ish/intel_ish_5_8_0.dts → boards/intel/intel_ish/intel_ish_5_8_0.dts
diff --git a/...legacy/x86/intel_ish/intel_ish_5_8_0.yaml → boards/intel/intel_ish/intel_ish_5_8_0.yaml b/...legacy/x86/intel_ish/intel_ish_5_8_0.yaml → boards/intel/intel_ish/intel_ish_5_8_0.yaml
diff --git a/boards/intel/intel_ish/intel_ish_5_8_0_defconfig b/boards/intel/intel_ish/intel_ish_5_8_0_defconfig
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2023-2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# uart & console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_SERIAL=y
diff --git a/soc/soc_legacy/x86/intel_ish/CMakeLists.txt → soc/intel/intel_ish/CMakeLists.txt b/soc/soc_legacy/x86/intel_ish/CMakeLists.txt → soc/intel/intel_ish/CMakeLists.txt
diff --git a/soc/soc_legacy/x86/intel_ish/Kconfig → soc/intel/intel_ish/Kconfig b/soc/soc_legacy/x86/intel_ish/Kconfig → 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

diff --git a/...oc_legacy/x86/intel_ish/Kconfig.defconfig → soc/intel/intel_ish/Kconfig.defconfig b/...oc_legacy/x86/intel_ish/Kconfig.defconfig → 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
diff --git a/soc/intel/intel_ish/Kconfig.soc b/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"
diff --git a/.../x86/intel_ish/doc/supported_features.txt → ...ntel/intel_ish/doc/supported_features.txt b/.../x86/intel_ish/doc/supported_features.txt → ...ntel/intel_ish/doc/supported_features.txt
diff --git a/...y/x86/intel_ish/intel_ish5/CMakeLists.txt → ...intel/intel_ish/intel_ish5/CMakeLists.txt b/...y/x86/intel_ish/intel_ish5/CMakeLists.txt → ...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)

diff --git a/soc/intel/intel_ish/intel_ish5/Kconfig.defconfig.series b/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
diff --git a/soc/intel/intel_ish/intel_ish5/Kconfig.soc b/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
diff --git a/...legacy/x86/intel_ish/intel_ish5/linker.ld → soc/intel/intel_ish/intel_ish5/linker.ld b/...legacy/x86/intel_ish/intel_ish5/linker.ld → soc/intel/intel_ish/intel_ish5/linker.ld
diff --git a/...86/intel_ish/intel_ish5/pm/CMakeLists.txt → ...el/intel_ish/intel_ish5/pm/CMakeLists.txt b/...86/intel_ish/intel_ish5/pm/CMakeLists.txt → ...el/intel_ish/intel_ish5/pm/CMakeLists.txt
diff --git a/...cy/x86/intel_ish/intel_ish5/pm/Kconfig.pm → soc/intel/intel_ish/intel_ish5/pm/Kconfig.pm b/...cy/x86/intel_ish/intel_ish5/pm/Kconfig.pm → soc/intel/intel_ish/intel_ish5/pm/Kconfig.pm
diff --git a/...egacy/x86/intel_ish/intel_ish5/pm/power.c → soc/intel/intel_ish/intel_ish5/pm/power.c b/...egacy/x86/intel_ish/intel_ish5/pm/power.c → soc/intel/intel_ish/intel_ish5/pm/power.c
diff --git a/...soc_legacy/x86/intel_ish/intel_ish5/soc.c → soc/intel/intel_ish/intel_ish5/soc.c b/...soc_legacy/x86/intel_ish/intel_ish5/soc.c → soc/intel/intel_ish/intel_ish5/soc.c
diff --git a/...soc_legacy/x86/intel_ish/intel_ish5/soc.h → soc/intel/intel_ish/intel_ish5/soc.h b/...soc_legacy/x86/intel_ish/intel_ish5/soc.h → soc/intel/intel_ish/intel_ish5/soc.h
diff --git a/soc/intel/intel_ish/soc.yml b/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
diff --git a/.../intel_ish/utils/build_ish_firmware.cmake → .../intel_ish/utils/build_ish_firmware.cmake b/.../intel_ish/utils/build_ish_firmware.cmake → .../intel_ish/utils/build_ish_firmware.cmake
diff --git a/...x86/intel_ish/utils/build_ish_firmware.py → ...tel/intel_ish/utils/build_ish_firmware.py b/...x86/intel_ish/utils/build_ish_firmware.py → ...tel/intel_ish/utils/build_ish_firmware.py
diff --git a/soc/soc_legacy/x86/intel_ish/Kconfig.soc b/soc/soc_legacy/x86/intel_ish/Kconfig.soc
diff --git a/soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.defconfig.series b/soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.defconfig.series
diff --git a/soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.series b/soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.series
diff --git a/soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.soc b/soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.soc