From 4789e1068ec0049efcf4667419bed1f587045a96 Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Wed, 24 Jan 2024 13:05:04 +0100 Subject: [PATCH] boards: x86: intel_rpl: move and convert raptor_lake boards to HWMv2 Move and convert intel_rpl_p_crb and intel_rpl_s_crb boards to HWMv2. Signed-off-by: Dmitrii Golovanov --- boards/{x86 => v2/intel}/intel_rpl/CMakeLists.txt | 2 ++ .../{x86 => v2/intel}/intel_rpl/Kconfig.defconfig | 10 +++------- boards/v2/intel/intel_rpl/Kconfig.intel_rpl_p_crb | 5 +++++ boards/v2/intel/intel_rpl/Kconfig.intel_rpl_s_crb | 5 +++++ boards/{x86 => v2/intel}/intel_rpl/board.cmake | 0 boards/v2/intel/intel_rpl/board.yml | 9 +++++++++ boards/{x86 => v2/intel}/intel_rpl/doc/index.rst | 4 ++-- .../intel}/intel_rpl/intel_rpl_p_crb.dts | 0 .../intel}/intel_rpl/intel_rpl_p_crb.yaml | 0 .../intel}/intel_rpl/intel_rpl_p_crb_defconfig | 2 -- .../intel}/intel_rpl/intel_rpl_s_crb.dts | 0 .../intel}/intel_rpl/intel_rpl_s_crb.yaml | 0 .../intel}/intel_rpl/intel_rpl_s_crb_defconfig | 2 -- boards/x86/intel_rpl/Kconfig.board | 14 -------------- 14 files changed, 26 insertions(+), 27 deletions(-) rename boards/{x86 => v2/intel}/intel_rpl/CMakeLists.txt (91%) rename boards/{x86 => v2/intel}/intel_rpl/Kconfig.defconfig (76%) create mode 100644 boards/v2/intel/intel_rpl/Kconfig.intel_rpl_p_crb create mode 100644 boards/v2/intel/intel_rpl/Kconfig.intel_rpl_s_crb rename boards/{x86 => v2/intel}/intel_rpl/board.cmake (100%) create mode 100644 boards/v2/intel/intel_rpl/board.yml rename boards/{x86 => v2/intel}/intel_rpl/doc/index.rst (93%) rename boards/{x86 => v2/intel}/intel_rpl/intel_rpl_p_crb.dts (100%) rename boards/{x86 => v2/intel}/intel_rpl/intel_rpl_p_crb.yaml (100%) rename boards/{x86 => v2/intel}/intel_rpl/intel_rpl_p_crb_defconfig (82%) rename boards/{x86 => v2/intel}/intel_rpl/intel_rpl_s_crb.dts (100%) rename boards/{x86 => v2/intel}/intel_rpl/intel_rpl_s_crb.yaml (100%) rename boards/{x86 => v2/intel}/intel_rpl/intel_rpl_s_crb_defconfig (82%) delete mode 100644 boards/x86/intel_rpl/Kconfig.board diff --git a/boards/x86/intel_rpl/CMakeLists.txt b/boards/v2/intel/intel_rpl/CMakeLists.txt similarity index 91% rename from boards/x86/intel_rpl/CMakeLists.txt rename to boards/v2/intel/intel_rpl/CMakeLists.txt index 2dc5afcc323..36ddcdf9d13 100644 --- a/boards/x86/intel_rpl/CMakeLists.txt +++ b/boards/v2/intel/intel_rpl/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_rpl/Kconfig.defconfig b/boards/v2/intel/intel_rpl/Kconfig.defconfig similarity index 76% rename from boards/x86/intel_rpl/Kconfig.defconfig rename to boards/v2/intel/intel_rpl/Kconfig.defconfig index 0458aef89be..ca8a7742688 100644 --- a/boards/x86/intel_rpl/Kconfig.defconfig +++ b/boards/v2/intel/intel_rpl/Kconfig.defconfig @@ -1,11 +1,6 @@ -# Copyright (c) 2022-2023 Intel Corporation +# Copyright (c) 2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -if BOARD_INTEL_RPL_S_CRB || BOARD_INTEL_RPL_P_CRB - -config BOARD - default "intel_rpl_p_crb" if BOARD_INTEL_RPL_P_CRB - default "intel_rpl_s_crb" if BOARD_INTEL_RPL_S_CRB config BUILD_OUTPUT_STRIPPED default y @@ -60,4 +55,5 @@ config SHELL_STACK_SIZE default 320000 endif -endif # BOARD_INTEL_RPL_S_CRB || BOARD_INTEL_RPL_P_CRB +config HAS_COVERAGE_SUPPORT + default y diff --git a/boards/v2/intel/intel_rpl/Kconfig.intel_rpl_p_crb b/boards/v2/intel/intel_rpl/Kconfig.intel_rpl_p_crb new file mode 100644 index 00000000000..91449a9d2b7 --- /dev/null +++ b/boards/v2/intel/intel_rpl/Kconfig.intel_rpl_p_crb @@ -0,0 +1,5 @@ +# Copyright (c) 2022-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_RPL_P_CRB + select SOC_RAPTOR_LAKE diff --git a/boards/v2/intel/intel_rpl/Kconfig.intel_rpl_s_crb b/boards/v2/intel/intel_rpl/Kconfig.intel_rpl_s_crb new file mode 100644 index 00000000000..79dc093dfe6 --- /dev/null +++ b/boards/v2/intel/intel_rpl/Kconfig.intel_rpl_s_crb @@ -0,0 +1,5 @@ +# Copyright (c) 2022-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_RPL_S_CRB + select SOC_RAPTOR_LAKE diff --git a/boards/x86/intel_rpl/board.cmake b/boards/v2/intel/intel_rpl/board.cmake similarity index 100% rename from boards/x86/intel_rpl/board.cmake rename to boards/v2/intel/intel_rpl/board.cmake diff --git a/boards/v2/intel/intel_rpl/board.yml b/boards/v2/intel/intel_rpl/board.yml new file mode 100644 index 00000000000..cc3969adced --- /dev/null +++ b/boards/v2/intel/intel_rpl/board.yml @@ -0,0 +1,9 @@ +boards: + - name: intel_rpl_p_crb + vendor: intel + socs: + - name: raptor_lake + - name: intel_rpl_s_crb + vendor: intel + socs: + - name: raptor_lake diff --git a/boards/x86/intel_rpl/doc/index.rst b/boards/v2/intel/intel_rpl/doc/index.rst similarity index 93% rename from boards/x86/intel_rpl/doc/index.rst rename to boards/v2/intel/intel_rpl/doc/index.rst index 7c3d7758484..f75ad5a28fe 100644 --- a/boards/x86/intel_rpl/doc/index.rst +++ b/boards/v2/intel/intel_rpl/doc/index.rst @@ -33,7 +33,7 @@ Hardware General information about the board can be found at the `RPL`_. -.. include:: ../../../../soc/x86/raptor_lake/doc/supported_features.txt +.. include:: ../../../../../soc/v2/intel/raptor_lake/doc/supported_features.txt Connections and IOs @@ -69,7 +69,7 @@ Build Zephyr application Booting the Raptor Lake S CRB Board using UEFI ============================================== -.. include:: ../../common/efi_boot.rst +.. include:: ../../../../../boards/x86/common/efi_boot.rst :start-after: start_include_here .. _RPL: https://edc.intel.com/content/www/us/en/design/products/platforms/details/raptor-lake-s/13th-generation-core-processors-datasheet-volume-1-of-2/ diff --git a/boards/x86/intel_rpl/intel_rpl_p_crb.dts b/boards/v2/intel/intel_rpl/intel_rpl_p_crb.dts similarity index 100% rename from boards/x86/intel_rpl/intel_rpl_p_crb.dts rename to boards/v2/intel/intel_rpl/intel_rpl_p_crb.dts diff --git a/boards/x86/intel_rpl/intel_rpl_p_crb.yaml b/boards/v2/intel/intel_rpl/intel_rpl_p_crb.yaml similarity index 100% rename from boards/x86/intel_rpl/intel_rpl_p_crb.yaml rename to boards/v2/intel/intel_rpl/intel_rpl_p_crb.yaml diff --git a/boards/x86/intel_rpl/intel_rpl_p_crb_defconfig b/boards/v2/intel/intel_rpl/intel_rpl_p_crb_defconfig similarity index 82% rename from boards/x86/intel_rpl/intel_rpl_p_crb_defconfig rename to boards/v2/intel/intel_rpl/intel_rpl_p_crb_defconfig index 09fd65cf261..c94efc744f6 100644 --- a/boards/x86/intel_rpl/intel_rpl_p_crb_defconfig +++ b/boards/v2/intel/intel_rpl/intel_rpl_p_crb_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_RAPTOR_LAKE=y -CONFIG_BOARD_INTEL_RPL_P_CRB=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/intel_rpl/intel_rpl_s_crb.dts b/boards/v2/intel/intel_rpl/intel_rpl_s_crb.dts similarity index 100% rename from boards/x86/intel_rpl/intel_rpl_s_crb.dts rename to boards/v2/intel/intel_rpl/intel_rpl_s_crb.dts diff --git a/boards/x86/intel_rpl/intel_rpl_s_crb.yaml b/boards/v2/intel/intel_rpl/intel_rpl_s_crb.yaml similarity index 100% rename from boards/x86/intel_rpl/intel_rpl_s_crb.yaml rename to boards/v2/intel/intel_rpl/intel_rpl_s_crb.yaml diff --git a/boards/x86/intel_rpl/intel_rpl_s_crb_defconfig b/boards/v2/intel/intel_rpl/intel_rpl_s_crb_defconfig similarity index 82% rename from boards/x86/intel_rpl/intel_rpl_s_crb_defconfig rename to boards/v2/intel/intel_rpl/intel_rpl_s_crb_defconfig index 1d8570bdeb7..c94efc744f6 100644 --- a/boards/x86/intel_rpl/intel_rpl_s_crb_defconfig +++ b/boards/v2/intel/intel_rpl/intel_rpl_s_crb_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_RAPTOR_LAKE=y -CONFIG_BOARD_INTEL_RPL_S_CRB=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_CONSOLE=y diff --git a/boards/x86/intel_rpl/Kconfig.board b/boards/x86/intel_rpl/Kconfig.board deleted file mode 100644 index 0424004d10b..00000000000 --- a/boards/x86/intel_rpl/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2022-2023 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_RPL_S_CRB - bool "Raptor Lake S CRB" - depends on SOC_RAPTOR_LAKE - select X86_64 - select HAS_COVERAGE_SUPPORT - -config BOARD_INTEL_RPL_P_CRB - bool "Raptor Lake P CRB" - depends on SOC_RAPTOR_LAKE - select X86_64 - select HAS_COVERAGE_SUPPORT