From d0154b0192a0e7d34498d121ecd1e01a710790d3 Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Mon, 5 Feb 2024 11:02:33 +0100 Subject: [PATCH 1/3] 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 b3865915a2a2..31568e85d65d 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 adcca64b9a80..e944782809e8 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 000000000000..c08d5f15f4ae --- /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 3c253ac26483..dce4b9cc9062 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 000000000000..8b8fea9f29ac --- /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 000000000000..37c1990ca3f3 --- /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 000000000000..ff1330c85f54 --- /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 b4b1e1456b93..000000000000 --- 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 fecc6d2428f3..000000000000 --- 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 ef39ee29c20a..000000000000 --- 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 bbc4a76fdae4..000000000000 --- 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 From 69478d625a04db37757852c971e84d0ef91bda05 Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Mon, 5 Feb 2024 11:29:05 +0100 Subject: [PATCH 2/3] boards: x86: intel_ish: move and convert intel_ish boards to HWMv2 Move and convert to HWMv2 the following board configurations: intel_ish_5_4_1, intel_ish_5_6_0, intel_ish_5_8_0 Signed-off-by: Dmitrii Golovanov --- .../boards_legacy/x86/intel_ish/Kconfig.board | 16 -------------- .../x86/intel_ish/Kconfig.defconfig | 22 ------------------- .../x86/intel_ish/intel_ish_5_4_1_defconfig | 15 ------------- .../x86/intel_ish/intel_ish_5_6_0_defconfig | 15 ------------- .../x86/intel_ish/intel_ish_5_8_0_defconfig | 15 ------------- boards/intel/intel_ish/Kconfig.defconfig | 12 ++++++++++ .../intel/intel_ish/Kconfig.intel_ish_5_4_1 | 6 +++++ .../intel/intel_ish/Kconfig.intel_ish_5_6_0 | 6 +++++ .../intel/intel_ish/Kconfig.intel_ish_5_8_0 | 6 +++++ boards/intel/intel_ish/board.yml | 16 ++++++++++++++ .../x86 => intel}/intel_ish/doc/index.rst | 2 +- .../intel_ish/intel_ish_5_4_1.dts | 0 .../intel_ish/intel_ish_5_4_1.yaml | 0 .../intel/intel_ish/intel_ish_5_4_1_defconfig | 10 +++++++++ .../intel_ish/intel_ish_5_6_0.dts | 0 .../intel_ish/intel_ish_5_6_0.yaml | 0 .../intel/intel_ish/intel_ish_5_6_0_defconfig | 10 +++++++++ .../intel_ish/intel_ish_5_8_0.dts | 0 .../intel_ish/intel_ish_5_8_0.yaml | 0 .../intel/intel_ish/intel_ish_5_8_0_defconfig | 10 +++++++++ 20 files changed, 77 insertions(+), 84 deletions(-) delete mode 100644 boards/boards_legacy/x86/intel_ish/Kconfig.board delete mode 100644 boards/boards_legacy/x86/intel_ish/Kconfig.defconfig delete mode 100644 boards/boards_legacy/x86/intel_ish/intel_ish_5_4_1_defconfig delete mode 100644 boards/boards_legacy/x86/intel_ish/intel_ish_5_6_0_defconfig delete mode 100644 boards/boards_legacy/x86/intel_ish/intel_ish_5_8_0_defconfig create mode 100644 boards/intel/intel_ish/Kconfig.defconfig create mode 100644 boards/intel/intel_ish/Kconfig.intel_ish_5_4_1 create mode 100644 boards/intel/intel_ish/Kconfig.intel_ish_5_6_0 create mode 100644 boards/intel/intel_ish/Kconfig.intel_ish_5_8_0 create mode 100644 boards/intel/intel_ish/board.yml rename boards/{boards_legacy/x86 => intel}/intel_ish/doc/index.rst (96%) rename boards/{boards_legacy/x86 => intel}/intel_ish/intel_ish_5_4_1.dts (100%) rename boards/{boards_legacy/x86 => intel}/intel_ish/intel_ish_5_4_1.yaml (100%) create mode 100644 boards/intel/intel_ish/intel_ish_5_4_1_defconfig rename boards/{boards_legacy/x86 => intel}/intel_ish/intel_ish_5_6_0.dts (100%) rename boards/{boards_legacy/x86 => intel}/intel_ish/intel_ish_5_6_0.yaml (100%) create mode 100644 boards/intel/intel_ish/intel_ish_5_6_0_defconfig rename boards/{boards_legacy/x86 => intel}/intel_ish/intel_ish_5_8_0.dts (100%) rename boards/{boards_legacy/x86 => intel}/intel_ish/intel_ish_5_8_0.yaml (100%) create mode 100644 boards/intel/intel_ish/intel_ish_5_8_0_defconfig diff --git a/boards/boards_legacy/x86/intel_ish/Kconfig.board b/boards/boards_legacy/x86/intel_ish/Kconfig.board deleted file mode 100644 index 77962495a12e..000000000000 --- a/boards/boards_legacy/x86/intel_ish/Kconfig.board +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2023 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 -# - -config BOARD_INTEL_ISH_5_4_1 - bool "Intel ISH 5.4.1 board" - depends on SOC_INTEL_ISH_5_4_1 - -config BOARD_INTEL_ISH_5_6_0 - bool "Intel ISH 5.6.0 board" - depends on SOC_INTEL_ISH_5_6_0 - -config BOARD_INTEL_ISH_5_8_0 - bool "Intel ISH 5.8.0 board" - depends on SOC_INTEL_ISH_5_8_0 diff --git a/boards/boards_legacy/x86/intel_ish/Kconfig.defconfig b/boards/boards_legacy/x86/intel_ish/Kconfig.defconfig deleted file mode 100644 index 1f3d68096437..000000000000 --- a/boards/boards_legacy/x86/intel_ish/Kconfig.defconfig +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2023 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 -# - -if BOARD_INTEL_ISH_5_4_1 || BOARD_INTEL_ISH_5_6_0 || BOARD_INTEL_ISH_5_8_0 - -config BOARD - default "intel_ish_5_4_1" if BOARD_INTEL_ISH_5_4_1 - default "intel_ish_5_6_0" if BOARD_INTEL_ISH_5_6_0 - default "intel_ish_5_8_0" if BOARD_INTEL_ISH_5_8_0 - -if TEST -config TEST_EXTRA_STACK_SIZE - int - default 1024 -endif # TEST - -config SYS_CLOCK_TICKS_PER_SEC - default 2048 if HPET_TIMER # HPET is 32768 HZ - -endif # BOARD_INTEL_ISH_5_4_1 || BOARD_INTEL_ISH_5_6_0 || BOARD_INTEL_ISH_5_8_0 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 deleted file mode 100644 index 527466ad337b..000000000000 --- a/boards/boards_legacy/x86/intel_ish/intel_ish_5_4_1_defconfig +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) 2023 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 -# - -CONFIG_SOC_FAMILY_INTEL_ISH=y -CONFIG_SOC_SERIES_INTEL_ISH5=y -CONFIG_SOC_INTEL_ISH_5_4_1=y -CONFIG_BOARD_INTEL_ISH_5_4_1=y - -# uart & console -CONFIG_CONSOLE=y -CONFIG_UART_CONSOLE=y -CONFIG_SERIAL=y 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 deleted file mode 100644 index 74b00676d399..000000000000 --- a/boards/boards_legacy/x86/intel_ish/intel_ish_5_6_0_defconfig +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) 2023 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 -# - -CONFIG_SOC_FAMILY_INTEL_ISH=y -CONFIG_SOC_SERIES_INTEL_ISH5=y -CONFIG_SOC_INTEL_ISH_5_6_0=y -CONFIG_BOARD_INTEL_ISH_5_6_0=y - -# uart & console -CONFIG_CONSOLE=y -CONFIG_UART_CONSOLE=y -CONFIG_SERIAL=y 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 deleted file mode 100644 index ee319557f761..000000000000 --- a/boards/boards_legacy/x86/intel_ish/intel_ish_5_8_0_defconfig +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) 2023 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 -# - -CONFIG_SOC_FAMILY_INTEL_ISH=y -CONFIG_SOC_SERIES_INTEL_ISH5=y -CONFIG_SOC_INTEL_ISH_5_8_0=y -CONFIG_BOARD_INTEL_ISH_5_8_0=y - -# uart & console -CONFIG_CONSOLE=y -CONFIG_UART_CONSOLE=y -CONFIG_SERIAL=y diff --git a/boards/intel/intel_ish/Kconfig.defconfig b/boards/intel/intel_ish/Kconfig.defconfig new file mode 100644 index 000000000000..fdedc70fd29b --- /dev/null +++ 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 new file mode 100644 index 000000000000..62ef12136758 --- /dev/null +++ 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 new file mode 100644 index 000000000000..4c8fe37972cc --- /dev/null +++ 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 new file mode 100644 index 000000000000..122fc3b30ba8 --- /dev/null +++ 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 new file mode 100644 index 000000000000..ee7c46618007 --- /dev/null +++ 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/boards_legacy/x86/intel_ish/doc/index.rst b/boards/intel/intel_ish/doc/index.rst similarity index 96% rename from boards/boards_legacy/x86/intel_ish/doc/index.rst rename to boards/intel/intel_ish/doc/index.rst index 6d0cfd6f4427..d9c3c179b237 100644 --- a/boards/boards_legacy/x86/intel_ish/doc/index.rst +++ b/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/boards/boards_legacy/x86/intel_ish/intel_ish_5_4_1.dts b/boards/intel/intel_ish/intel_ish_5_4_1.dts similarity index 100% rename from boards/boards_legacy/x86/intel_ish/intel_ish_5_4_1.dts rename to boards/intel/intel_ish/intel_ish_5_4_1.dts diff --git a/boards/boards_legacy/x86/intel_ish/intel_ish_5_4_1.yaml b/boards/intel/intel_ish/intel_ish_5_4_1.yaml similarity index 100% rename from boards/boards_legacy/x86/intel_ish/intel_ish_5_4_1.yaml rename to 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 new file mode 100644 index 000000000000..de4d5660e15b --- /dev/null +++ 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/boards/boards_legacy/x86/intel_ish/intel_ish_5_6_0.dts b/boards/intel/intel_ish/intel_ish_5_6_0.dts similarity index 100% rename from boards/boards_legacy/x86/intel_ish/intel_ish_5_6_0.dts rename to boards/intel/intel_ish/intel_ish_5_6_0.dts diff --git a/boards/boards_legacy/x86/intel_ish/intel_ish_5_6_0.yaml b/boards/intel/intel_ish/intel_ish_5_6_0.yaml similarity index 100% rename from boards/boards_legacy/x86/intel_ish/intel_ish_5_6_0.yaml rename to 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 new file mode 100644 index 000000000000..de4d5660e15b --- /dev/null +++ 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/boards/boards_legacy/x86/intel_ish/intel_ish_5_8_0.dts b/boards/intel/intel_ish/intel_ish_5_8_0.dts similarity index 100% rename from boards/boards_legacy/x86/intel_ish/intel_ish_5_8_0.dts rename to boards/intel/intel_ish/intel_ish_5_8_0.dts diff --git a/boards/boards_legacy/x86/intel_ish/intel_ish_5_8_0.yaml b/boards/intel/intel_ish/intel_ish_5_8_0.yaml similarity index 100% rename from boards/boards_legacy/x86/intel_ish/intel_ish_5_8_0.yaml rename to 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 new file mode 100644 index 000000000000..de4d5660e15b --- /dev/null +++ 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 From db0dd1be479f39a79fb7cb51781ff83a14289127 Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Fri, 16 Feb 2024 17:47:09 +0100 Subject: [PATCH 3/3] MAINTAINERS: intel_ish: Adjust to HWMv2 move Adjust intel/intel_ish SoC and board maintainers to HWMv2 move. Signed-off-by: Dmitrii Golovanov --- MAINTAINERS.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index 26b34f70fde0..f6c3bcc26731 100644 --- 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*