diff --git a/boards/v2/intel/index.rst b/boards/v2/intel/index.rst new file mode 100644 index 00000000000..4ce05c0567a --- /dev/null +++ b/boards/v2/intel/index.rst @@ -0,0 +1,10 @@ +.. _boards-intel: + +Intel Corporation +################# + +.. toctree:: + :maxdepth: 1 + :glob: + + **/* diff --git a/boards/x86/intel_adl/CMakeLists.txt b/boards/v2/intel/intel_adl/CMakeLists.txt similarity index 91% rename from boards/x86/intel_adl/CMakeLists.txt rename to boards/v2/intel/intel_adl/CMakeLists.txt index 2dc5afcc323..36ddcdf9d13 100644 --- a/boards/x86/intel_adl/CMakeLists.txt +++ b/boards/v2/intel/intel_adl/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_adl/Kconfig.defconfig b/boards/v2/intel/intel_adl/Kconfig.defconfig similarity index 68% rename from boards/x86/intel_adl/Kconfig.defconfig rename to boards/v2/intel/intel_adl/Kconfig.defconfig index 5a61d2f552e..518f0c01ee2 100644 --- a/boards/x86/intel_adl/Kconfig.defconfig +++ b/boards/v2/intel/intel_adl/Kconfig.defconfig @@ -1,13 +1,6 @@ -# Copyright (c) 2023 Intel Corporation +# Copyright (c) 2023-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -if BOARD_INTEL_ADL_CRB || BOARD_INTEL_ADL_RVP || BOARD_UP_SQUARED_PRO_7000 - -config BOARD - default "intel_adl_crb" if BOARD_INTEL_ADL_CRB - default "intel_adl_rvp" if BOARD_INTEL_ADL_RVP - default "up_squared_pro_7000" if BOARD_UP_SQUARED_PRO_7000 - config BUILD_OUTPUT_STRIPPED default y @@ -56,4 +49,5 @@ endif config UART_NS16550_INTEL_LPSS_DMA default y -endif # BOARD_INTEL_ADL_CRB || BOARD_INTEL_ADL_RVP || BOARD_UP_SQUARED_PRO_7000 +config HAS_COVERAGE_SUPPORT + default y diff --git a/boards/v2/intel/intel_adl/Kconfig.intel_adl_crb b/boards/v2/intel/intel_adl/Kconfig.intel_adl_crb new file mode 100644 index 00000000000..81b9bd972b5 --- /dev/null +++ b/boards/v2/intel/intel_adl/Kconfig.intel_adl_crb @@ -0,0 +1,5 @@ +# Copyright (c) 2023-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_ADL_CRB + select SOC_ALDER_LAKE diff --git a/boards/v2/intel/intel_adl/Kconfig.intel_adl_rvp b/boards/v2/intel/intel_adl/Kconfig.intel_adl_rvp new file mode 100644 index 00000000000..01eca2f55f4 --- /dev/null +++ b/boards/v2/intel/intel_adl/Kconfig.intel_adl_rvp @@ -0,0 +1,5 @@ +# Copyright (c) 2023-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_ADL_RVP + select SOC_ALDER_LAKE diff --git a/boards/v2/intel/intel_adl/board.cmake b/boards/v2/intel/intel_adl/board.cmake new file mode 100644 index 00000000000..6b01bab2aee --- /dev/null +++ b/boards/v2/intel/intel_adl/board.cmake @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 + +board_set_flasher_ifnset(misc-flasher) +board_finalize_runner_args(misc-flasher) diff --git a/boards/v2/intel/intel_adl/board.yml b/boards/v2/intel/intel_adl/board.yml new file mode 100644 index 00000000000..fe51b63f813 --- /dev/null +++ b/boards/v2/intel/intel_adl/board.yml @@ -0,0 +1,9 @@ +boards: + - name: intel_adl_crb + vendor: intel + socs: + - name: alder_lake + - name: intel_adl_rvp + vendor: intel + socs: + - name: alder_lake diff --git a/boards/x86/intel_adl/doc/index.rst b/boards/v2/intel/intel_adl/doc/index.rst similarity index 96% rename from boards/x86/intel_adl/doc/index.rst rename to boards/v2/intel/intel_adl/doc/index.rst index 63a518248b8..6c5bf07ec77 100644 --- a/boards/x86/intel_adl/doc/index.rst +++ b/boards/v2/intel/intel_adl/doc/index.rst @@ -59,7 +59,7 @@ Build Zephyr application Booting the Alder Lake N CRB Board using UEFI ============================================= -.. include:: ../../common/efi_boot.rst +.. include:: ../../../../../boards/x86/common/efi_boot.rst :start-after: start_include_here .. _INTEL_ADL: https://edc.intel.com/content/www/us/en/design/products/platforms/processor-and-core-i3-n-series-datasheet-volume-1-of-2/ diff --git a/boards/x86/intel_adl/intel_adl.dts b/boards/v2/intel/intel_adl/intel_adl.dts similarity index 100% rename from boards/x86/intel_adl/intel_adl.dts rename to boards/v2/intel/intel_adl/intel_adl.dts diff --git a/boards/x86/intel_adl/intel_adl_crb.dts b/boards/v2/intel/intel_adl/intel_adl_crb.dts similarity index 100% rename from boards/x86/intel_adl/intel_adl_crb.dts rename to boards/v2/intel/intel_adl/intel_adl_crb.dts diff --git a/boards/x86/intel_adl/intel_adl_crb.yaml b/boards/v2/intel/intel_adl/intel_adl_crb.yaml similarity index 100% rename from boards/x86/intel_adl/intel_adl_crb.yaml rename to boards/v2/intel/intel_adl/intel_adl_crb.yaml diff --git a/boards/x86/intel_adl/intel_adl_crb_defconfig b/boards/v2/intel/intel_adl/intel_adl_crb_defconfig similarity index 81% rename from boards/x86/intel_adl/intel_adl_crb_defconfig rename to boards/v2/intel/intel_adl/intel_adl_crb_defconfig index 5287bfcacc0..fb9be2a4994 100644 --- a/boards/x86/intel_adl/intel_adl_crb_defconfig +++ b/boards/v2/intel/intel_adl/intel_adl_crb_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_ALDER_LAKE=y -CONFIG_BOARD_INTEL_ADL_CRB=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/intel_adl/intel_adl_rvp.dts b/boards/v2/intel/intel_adl/intel_adl_rvp.dts similarity index 100% rename from boards/x86/intel_adl/intel_adl_rvp.dts rename to boards/v2/intel/intel_adl/intel_adl_rvp.dts diff --git a/boards/x86/intel_adl/intel_adl_rvp.yaml b/boards/v2/intel/intel_adl/intel_adl_rvp.yaml similarity index 100% rename from boards/x86/intel_adl/intel_adl_rvp.yaml rename to boards/v2/intel/intel_adl/intel_adl_rvp.yaml diff --git a/boards/x86/intel_adl/intel_adl_rvp_defconfig b/boards/v2/intel/intel_adl/intel_adl_rvp_defconfig similarity index 81% rename from boards/x86/intel_adl/intel_adl_rvp_defconfig rename to boards/v2/intel/intel_adl/intel_adl_rvp_defconfig index 0f6ed718268..fb9be2a4994 100644 --- a/boards/x86/intel_adl/intel_adl_rvp_defconfig +++ b/boards/v2/intel/intel_adl/intel_adl_rvp_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_ALDER_LAKE=y -CONFIG_BOARD_INTEL_ADL_RVP=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/intel_adl/Kconfig.board b/boards/x86/intel_adl/Kconfig.board index 591da3261f2..5c0c5a23612 100644 --- a/boards/x86/intel_adl/Kconfig.board +++ b/boards/x86/intel_adl/Kconfig.board @@ -1,18 +1,6 @@ # Copyright (c) 2023 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -config BOARD_INTEL_ADL_CRB - bool "Alder Lake CRB" - depends on SOC_ALDER_LAKE - select X86_64 - select HAS_COVERAGE_SUPPORT - -config BOARD_INTEL_ADL_RVP - bool "Alder Lake RVP" - depends on SOC_ALDER_LAKE - select X86_64 - select HAS_COVERAGE_SUPPORT - config BOARD_UP_SQUARED_PRO_7000 bool "UP SQUARED PRO 7000 board" depends on SOC_ALDER_LAKE