boards: x86: intel_ehl: move and convert elkhart_lake boards to HWMv2

Move and convert `intel_ehl_crb` and `intel_ehl_crb_sbl` board
configurations to HWMv2.

`intel_ehl_crb_sbl` is changed to a variant `intel_ehl_crb/elkhart_lake/sbl`

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>

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

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

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

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'

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::

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

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

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

boards/x86/intel_ehl/Kconfig.board

@@ -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