From 5b9ef94106385efe4f697eef180a5790c617a897 Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Mon, 5 Feb 2024 11:02:33 +0100 Subject: [PATCH] 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 --- .../x86 => intel}/intel_ish/CMakeLists.txt | 0 .../x86 => intel}/intel_ish/Kconfig | 3 +-- .../x86 => intel}/intel_ish/Kconfig.defconfig | 10 +++---- soc/intel/intel_ish/Kconfig.soc | 13 +++++++++ .../intel_ish/doc/supported_features.txt | 0 .../intel_ish/intel_ish5/CMakeLists.txt | 4 ++- .../intel_ish5/Kconfig.defconfig.series | 10 +++++++ soc/intel/intel_ish/intel_ish5/Kconfig.soc | 27 +++++++++++++++++++ .../intel_ish/intel_ish5/linker.ld | 0 .../intel_ish/intel_ish5/pm/CMakeLists.txt | 0 .../intel_ish/intel_ish5/pm/Kconfig.pm | 0 .../intel_ish/intel_ish5/pm/power.c | 0 .../x86 => intel}/intel_ish/intel_ish5/soc.c | 0 .../x86 => intel}/intel_ish/intel_ish5/soc.h | 0 soc/intel/intel_ish/soc.yml | 8 ++++++ .../intel_ish/utils/build_ish_firmware.cmake | 0 .../intel_ish/utils/build_ish_firmware.py | 0 soc/soc_legacy/x86/intel_ish/Kconfig.soc | 8 ------ .../intel_ish5/Kconfig.defconfig.series | 20 -------------- .../x86/intel_ish/intel_ish5/Kconfig.series | 8 ------ .../x86/intel_ish/intel_ish5/Kconfig.soc | 19 ------------- 21 files changed, 65 insertions(+), 65 deletions(-) rename soc/{soc_legacy/x86 => intel}/intel_ish/CMakeLists.txt (100%) rename soc/{soc_legacy/x86 => intel}/intel_ish/Kconfig (80%) rename soc/{soc_legacy/x86 => intel}/intel_ish/Kconfig.defconfig (83%) create mode 100644 soc/intel/intel_ish/Kconfig.soc rename soc/{soc_legacy/x86 => intel}/intel_ish/doc/supported_features.txt (100%) rename soc/{soc_legacy/x86 => intel}/intel_ish/intel_ish5/CMakeLists.txt (78%) create mode 100644 soc/intel/intel_ish/intel_ish5/Kconfig.defconfig.series create mode 100644 soc/intel/intel_ish/intel_ish5/Kconfig.soc rename soc/{soc_legacy/x86 => intel}/intel_ish/intel_ish5/linker.ld (100%) rename soc/{soc_legacy/x86 => intel}/intel_ish/intel_ish5/pm/CMakeLists.txt (100%) rename soc/{soc_legacy/x86 => intel}/intel_ish/intel_ish5/pm/Kconfig.pm (100%) rename soc/{soc_legacy/x86 => intel}/intel_ish/intel_ish5/pm/power.c (100%) rename soc/{soc_legacy/x86 => intel}/intel_ish/intel_ish5/soc.c (100%) rename soc/{soc_legacy/x86 => intel}/intel_ish/intel_ish5/soc.h (100%) create mode 100644 soc/intel/intel_ish/soc.yml rename soc/{soc_legacy/x86 => intel}/intel_ish/utils/build_ish_firmware.cmake (100%) rename soc/{soc_legacy/x86 => intel}/intel_ish/utils/build_ish_firmware.py (100%) delete mode 100644 soc/soc_legacy/x86/intel_ish/Kconfig.soc delete mode 100644 soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.defconfig.series delete mode 100644 soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.series delete mode 100644 soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.soc diff --git a/soc/soc_legacy/x86/intel_ish/CMakeLists.txt b/soc/intel/intel_ish/CMakeLists.txt similarity index 100% rename from soc/soc_legacy/x86/intel_ish/CMakeLists.txt rename to soc/intel/intel_ish/CMakeLists.txt diff --git a/soc/soc_legacy/x86/intel_ish/Kconfig b/soc/intel/intel_ish/Kconfig similarity index 80% rename from soc/soc_legacy/x86/intel_ish/Kconfig rename to soc/intel/intel_ish/Kconfig index b3865915a2a..31568e85d65 100644 --- a/soc/soc_legacy/x86/intel_ish/Kconfig +++ b/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/soc/soc_legacy/x86/intel_ish/Kconfig.defconfig b/soc/intel/intel_ish/Kconfig.defconfig similarity index 83% rename from soc/soc_legacy/x86/intel_ish/Kconfig.defconfig rename to soc/intel/intel_ish/Kconfig.defconfig index adcca64b9a8..e944782809e 100644 --- a/soc/soc_legacy/x86/intel_ish/Kconfig.defconfig +++ b/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 new file mode 100644 index 00000000000..c08d5f15f4a --- /dev/null +++ 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/soc/soc_legacy/x86/intel_ish/doc/supported_features.txt b/soc/intel/intel_ish/doc/supported_features.txt similarity index 100% rename from soc/soc_legacy/x86/intel_ish/doc/supported_features.txt rename to soc/intel/intel_ish/doc/supported_features.txt diff --git a/soc/soc_legacy/x86/intel_ish/intel_ish5/CMakeLists.txt b/soc/intel/intel_ish/intel_ish5/CMakeLists.txt similarity index 78% rename from soc/soc_legacy/x86/intel_ish/intel_ish5/CMakeLists.txt rename to soc/intel/intel_ish/intel_ish5/CMakeLists.txt index 3c253ac2648..dce4b9cc906 100644 --- a/soc/soc_legacy/x86/intel_ish/intel_ish5/CMakeLists.txt +++ b/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) diff --git a/soc/intel/intel_ish/intel_ish5/Kconfig.defconfig.series b/soc/intel/intel_ish/intel_ish5/Kconfig.defconfig.series new file mode 100644 index 00000000000..8b8fea9f29a --- /dev/null +++ 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 new file mode 100644 index 00000000000..37c1990ca3f --- /dev/null +++ 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/soc/soc_legacy/x86/intel_ish/intel_ish5/linker.ld b/soc/intel/intel_ish/intel_ish5/linker.ld similarity index 100% rename from soc/soc_legacy/x86/intel_ish/intel_ish5/linker.ld rename to soc/intel/intel_ish/intel_ish5/linker.ld diff --git a/soc/soc_legacy/x86/intel_ish/intel_ish5/pm/CMakeLists.txt b/soc/intel/intel_ish/intel_ish5/pm/CMakeLists.txt similarity index 100% rename from soc/soc_legacy/x86/intel_ish/intel_ish5/pm/CMakeLists.txt rename to soc/intel/intel_ish/intel_ish5/pm/CMakeLists.txt diff --git a/soc/soc_legacy/x86/intel_ish/intel_ish5/pm/Kconfig.pm b/soc/intel/intel_ish/intel_ish5/pm/Kconfig.pm similarity index 100% rename from soc/soc_legacy/x86/intel_ish/intel_ish5/pm/Kconfig.pm rename to soc/intel/intel_ish/intel_ish5/pm/Kconfig.pm diff --git a/soc/soc_legacy/x86/intel_ish/intel_ish5/pm/power.c b/soc/intel/intel_ish/intel_ish5/pm/power.c similarity index 100% rename from soc/soc_legacy/x86/intel_ish/intel_ish5/pm/power.c rename to soc/intel/intel_ish/intel_ish5/pm/power.c diff --git a/soc/soc_legacy/x86/intel_ish/intel_ish5/soc.c b/soc/intel/intel_ish/intel_ish5/soc.c similarity index 100% rename from soc/soc_legacy/x86/intel_ish/intel_ish5/soc.c rename to soc/intel/intel_ish/intel_ish5/soc.c diff --git a/soc/soc_legacy/x86/intel_ish/intel_ish5/soc.h b/soc/intel/intel_ish/intel_ish5/soc.h similarity index 100% rename from soc/soc_legacy/x86/intel_ish/intel_ish5/soc.h rename to soc/intel/intel_ish/intel_ish5/soc.h diff --git a/soc/intel/intel_ish/soc.yml b/soc/intel/intel_ish/soc.yml new file mode 100644 index 00000000000..ff1330c85f5 --- /dev/null +++ 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/soc/soc_legacy/x86/intel_ish/utils/build_ish_firmware.cmake b/soc/intel/intel_ish/utils/build_ish_firmware.cmake similarity index 100% rename from soc/soc_legacy/x86/intel_ish/utils/build_ish_firmware.cmake rename to soc/intel/intel_ish/utils/build_ish_firmware.cmake diff --git a/soc/soc_legacy/x86/intel_ish/utils/build_ish_firmware.py b/soc/intel/intel_ish/utils/build_ish_firmware.py similarity index 100% rename from soc/soc_legacy/x86/intel_ish/utils/build_ish_firmware.py rename to soc/intel/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 deleted file mode 100644 index b4b1e1456b9..00000000000 --- a/soc/soc_legacy/x86/intel_ish/Kconfig.soc +++ /dev/null @@ -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" 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 deleted file mode 100644 index fecc6d2428f..00000000000 --- a/soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.defconfig.series +++ /dev/null @@ -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" diff --git a/soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.series b/soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.series deleted file mode 100644 index ef39ee29c20..00000000000 --- a/soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.series +++ /dev/null @@ -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 diff --git a/soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.soc b/soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.soc deleted file mode 100644 index bbc4a76fdae..00000000000 --- a/soc/soc_legacy/x86/intel_ish/intel_ish5/Kconfig.soc +++ /dev/null @@ -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