diff --git a/boards/x86/intel_ehl/CMakeLists.txt b/boards/v2/intel/intel_ehl/CMakeLists.txt similarity index 91% rename from boards/x86/intel_ehl/CMakeLists.txt rename to boards/v2/intel/intel_ehl/CMakeLists.txt index 2dc5afcc323..36ddcdf9d13 100644 --- a/boards/x86/intel_ehl/CMakeLists.txt +++ b/boards/v2/intel/intel_ehl/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 + # Create an EFI image if(CONFIG_BUILD_OUTPUT_EFI) set_property(GLOBAL APPEND PROPERTY extra_post_build_commands diff --git a/boards/x86/intel_ehl/Kconfig.defconfig b/boards/v2/intel/intel_ehl/Kconfig.defconfig similarity index 69% rename from boards/x86/intel_ehl/Kconfig.defconfig rename to boards/v2/intel/intel_ehl/Kconfig.defconfig index ae8270faa64..9e7dcf48a04 100644 --- a/boards/x86/intel_ehl/Kconfig.defconfig +++ b/boards/v2/intel/intel_ehl/Kconfig.defconfig @@ -1,11 +1,6 @@ -# Copyright (c) 2020 Intel Corporation +# Copyright (c) 2020-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -if BOARD_INTEL_EHL_CRB || BOARD_INTEL_EHL_CRB_SBL - -config BOARD - default "intel_ehl_crb_sbl" if BOARD_INTEL_EHL_CRB_SBL - default "intel_ehl_crb" config BUILD_OUTPUT_STRIPPED default y @@ -13,7 +8,7 @@ config BUILD_OUTPUT_STRIPPED config MP_MAX_NUM_CPUS default 2 -if BOARD_INTEL_EHL_CRB_SBL +if BOARD_INTEL_EHL_CRB_ELKHART_LAKE_SBL config SHELL_BACKEND_SERIAL_INTERRUPT_DRIVEN depends on SHELL_BACKEND_SERIAL default n @@ -38,4 +33,7 @@ config APIC_TIMER_TSC_N default 249 endif -endif # BOARD_INTEL_EHL_CRB || BOARD_INTEL_EHL_CRB_SBL +if BOARD_INTEL_EHL_CRB_ELKHART_LAKE + config HAS_COVERAGE_SUPPORT + default y +endif diff --git a/boards/v2/intel/intel_ehl/Kconfig.intel_ehl_crb b/boards/v2/intel/intel_ehl/Kconfig.intel_ehl_crb new file mode 100644 index 00000000000..1d99891fe58 --- /dev/null +++ b/boards/v2/intel/intel_ehl/Kconfig.intel_ehl_crb @@ -0,0 +1,5 @@ +# Copyright (c) 2020-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_EHL_CRB + select SOC_ELKHART_LAKE diff --git a/boards/x86/intel_ehl/board.cmake b/boards/v2/intel/intel_ehl/board.cmake similarity index 100% rename from boards/x86/intel_ehl/board.cmake rename to boards/v2/intel/intel_ehl/board.cmake diff --git a/boards/v2/intel/intel_ehl/board.yml b/boards/v2/intel/intel_ehl/board.yml new file mode 100644 index 00000000000..5f8d3cafa1b --- /dev/null +++ b/boards/v2/intel/intel_ehl/board.yml @@ -0,0 +1,7 @@ +board: + name: intel_ehl_crb + vendor: intel + socs: + - name: elkhart_lake + variants: + - name: 'sbl' diff --git a/boards/x86/intel_ehl/doc/index.rst b/boards/v2/intel/intel_ehl/doc/index.rst similarity index 94% rename from boards/x86/intel_ehl/doc/index.rst rename to boards/v2/intel/intel_ehl/doc/index.rst index 1aa8f530155..250b215f040 100644 --- a/boards/x86/intel_ehl/doc/index.rst +++ b/boards/v2/intel/intel_ehl/doc/index.rst @@ -19,7 +19,7 @@ Hardware General information about the board can be found at the `EHL`_ website. -.. include:: ../../../../soc/x86/elkhart_lake/doc/supported_features.txt +.. include:: ../../../../../soc/v2/intel/elkhart_lake/doc/supported_features.txt Connections and IOs @@ -61,7 +61,7 @@ Booting the Elkhart Lake CRB Board using UEFI Booting the Elkhart Lake CRB Board over network =============================================== -.. include:: ../../common/net_boot.rst +.. include:: ../../../../../boards/x86/common/net_boot.rst :start-after: start_include_here .. note:: diff --git a/boards/x86/intel_ehl/intel_ehl_crb.dts b/boards/v2/intel/intel_ehl/intel_ehl_crb.dts similarity index 100% rename from boards/x86/intel_ehl/intel_ehl_crb.dts rename to boards/v2/intel/intel_ehl/intel_ehl_crb.dts diff --git a/boards/x86/intel_ehl/intel_ehl_crb.yaml b/boards/v2/intel/intel_ehl/intel_ehl_crb.yaml similarity index 100% rename from boards/x86/intel_ehl/intel_ehl_crb.yaml rename to boards/v2/intel/intel_ehl/intel_ehl_crb.yaml diff --git a/boards/x86/intel_ehl/intel_ehl_crb_defconfig b/boards/v2/intel/intel_ehl/intel_ehl_crb_defconfig similarity index 80% rename from boards/x86/intel_ehl/intel_ehl_crb_defconfig rename to boards/v2/intel/intel_ehl/intel_ehl_crb_defconfig index e25760a5a05..ba1c681c4cf 100644 --- a/boards/x86/intel_ehl/intel_ehl_crb_defconfig +++ b/boards/v2/intel/intel_ehl/intel_ehl_crb_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_ELKHART_LAKE=y -CONFIG_BOARD_INTEL_EHL_CRB=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/intel_ehl/intel_ehl_crb_sbl.dts b/boards/v2/intel/intel_ehl/intel_ehl_crb_sbl.dts similarity index 100% rename from boards/x86/intel_ehl/intel_ehl_crb_sbl.dts rename to boards/v2/intel/intel_ehl/intel_ehl_crb_sbl.dts diff --git a/boards/x86/intel_ehl/intel_ehl_crb_sbl.yaml b/boards/v2/intel/intel_ehl/intel_ehl_crb_sbl.yaml similarity index 78% rename from boards/x86/intel_ehl/intel_ehl_crb_sbl.yaml rename to boards/v2/intel/intel_ehl/intel_ehl_crb_sbl.yaml index 52cfa670ae6..3493ed0611d 100644 --- a/boards/x86/intel_ehl/intel_ehl_crb_sbl.yaml +++ b/boards/v2/intel/intel_ehl/intel_ehl_crb_sbl.yaml @@ -1,4 +1,4 @@ -identifier: intel_ehl_crb_sbl +identifier: intel_ehl_crb/elkhart_lake/sbl name: Elkhart Lake CRB with Slim Bootloader type: mcu arch: x86 diff --git a/boards/x86/intel_ehl/intel_ehl_crb_sbl_defconfig b/boards/v2/intel/intel_ehl/intel_ehl_crb_sbl_defconfig similarity index 75% rename from boards/x86/intel_ehl/intel_ehl_crb_sbl_defconfig rename to boards/v2/intel/intel_ehl/intel_ehl_crb_sbl_defconfig index 1ccff387dc1..29055f28717 100644 --- a/boards/x86/intel_ehl/intel_ehl_crb_sbl_defconfig +++ b/boards/v2/intel/intel_ehl/intel_ehl_crb_sbl_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_ELKHART_LAKE=y -CONFIG_BOARD_INTEL_EHL_CRB_SBL=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/intel_ehl/Kconfig.board b/boards/x86/intel_ehl/Kconfig.board deleted file mode 100644 index a04a9973eb0..00000000000 --- a/boards/x86/intel_ehl/Kconfig.board +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2020 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_EHL_CRB - bool "Elkhart Lake CRB" - depends on SOC_ELKHART_LAKE - select X86_64 - select HAS_COVERAGE_SUPPORT - -config BOARD_INTEL_EHL_CRB_SBL - bool "Elkhart Lake CRB (with Slim Bootloader)" - depends on SOC_ELKHART_LAKE - select X86_64