boards: x86: qemu_x86: move and convert to HWMv2

Move and convert qemu_x86 board configurations to HWMv2.

Several board configurations have changed their identifiers
to the HWMv2 scheme:

 - qemu_x86_nokpti --> qemu_x86/ia32/nokpti
 - qemu_x86_nommu  --> qemu_x86/ia32/nommu
 - qemu_x86_nopae  --> qemu_x86/ia32/nopae
 - qemu_x86_virt   --> qemu_x86/ia32/virt
 - qemu_x86_xip    --> qemu_x86/ia32/xip

 - qemu_x86_64_nokpti --> qemu_x86_64/ia32/nokpti

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

boards/boards_legacy/x86/qemu_x86/Kconfig.board

@@ -1,29 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_QEMU_X86
-	bool "QEMU x86"
-	depends on SOC_IA32
-	select QEMU_TARGET
-	select CPU_HAS_FPU
-	select HAS_COVERAGE_SUPPORT
-
-config BOARD_QEMU_X86_64
-	bool "QEMU x86_64"
-	depends on SOC_IA32
-	select QEMU_TARGET
-	select X86_64
-	select HAS_COVERAGE_SUPPORT
-
-config BOARD_QEMU_X86_LAKEMONT
-	bool "QEMU x86 (Lakemont)"
-	depends on SOC_LAKEMONT
-	select QEMU_TARGET
-	select CPU_HAS_FPU
-	select HAS_COVERAGE_SUPPORT
-
-config BOARD_QEMU_X86_TINY
-	bool "QEMU x86 (tiny memory)"
-	depends on SOC_IA32
-	select QEMU_TARGET
-	select CPU_HAS_FPU
-	select HAS_COVERAGE_SUPPORT

boards/qemu/qemu_x86/CMakeLists.txt

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: Apache-2.0
+
 if(CONFIG_BOARD_QEMU_X86_64 AND CONFIG_BUILD_OUTPUT_EFI)
 set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
   COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/arch/x86/zefi/zefi.py

boards/qemu/qemu_x86/Kconfig

@@ -0,0 +1,19 @@
+# Copyright (c) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_QEMU_X86
+	bool
+	select CPU_HAS_FPU
+
+config BOARD_QEMU_X86_64
+	bool
+	select X86_64
+
+config BOARD_QEMU_X86_LAKEMONT
+	bool
+	select CPU_HAS_FPU
+
+config BOARD_QEMU_X86_TINY
+	bool
+	select CPU_HAS_FPU

boards/qemu/qemu_x86/Kconfig.defconfig

@@ -10,12 +10,16 @@ config EEPROM_INIT_PRIORITY
 config BUILD_OUTPUT_BIN
 	default n
 
+config QEMU_TARGET
+	default y
+
+config HAS_COVERAGE_SUPPORT
+	default y
+
 endif # BOARD_QEMU_X86 || BOARD_QEMU_X86_64 || BOARD_QEMU_X86_LAKEMONT || BOARD_QEMU_X86_TINY
 
-if BOARD_QEMU_X86
 
-config BOARD
+if BOARD_QEMU_X86
-	default "qemu_x86"
 
 config FLASH_SIMULATOR
 	default y
@@ -41,20 +45,16 @@ config QEMU_ICOUNT_SHIFT
 
 endif # BOARD_QEMU_X86
 
-if BOARD_QEMU_X86_64
 
-config BOARD
+if BOARD_QEMU_X86_64
-	default "qemu_x86_64"
 
 config KERNEL_VM_SIZE
 	default 0x10000000 if ACPI
 
 endif # BOARD_QEMU_X86_64
 
-if BOARD_QEMU_X86_LAKEMONT
 
-config BOARD
+if BOARD_QEMU_X86_LAKEMONT
-	default "qemu_x86_lakemont"
 
 config KERNEL_VM_SIZE
 	default 0x400000
@@ -75,10 +75,8 @@ config QEMU_ICOUNT_SHIFT
 
 endif # BOARD_QEMU_X86_LAKEMONT
 
-if BOARD_QEMU_X86_TINY
 
-config BOARD
+if BOARD_QEMU_X86_TINY
-	default "qemu_x86_tiny"
 
 config KERNEL_VM_SIZE
 	default 0x400000
@@ -101,7 +99,7 @@ config HAVE_CUSTOM_LINKER_SCRIPT
 	default y
 
 config CUSTOM_LINKER_SCRIPT
-	default "${ZEPHYR_BASE}/boards/x86/qemu_x86/qemu_x86_tiny.ld"
+	default "${ZEPHYR_BASE}/boards/qemu/qemu_x86/qemu_x86_tiny.ld"
 
 config X86_EXTRA_PAGE_TABLE_PAGES
 	# This is needed for gen_mmu.py to map the flash into memory

boards/qemu/qemu_x86/Kconfig.qemu_x86

@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_QEMU_X86
+	select SOC_IA32

boards/qemu/qemu_x86/Kconfig.qemu_x86_64

@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_QEMU_X86_64
+	select SOC_IA32

boards/qemu/qemu_x86/Kconfig.qemu_x86_lakemont

@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_QEMU_X86_LAKEMONT
+	select SOC_LAKEMONT

boards/qemu/qemu_x86/Kconfig.qemu_x86_tiny

@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_QEMU_X86_TINY
+	select SOC_IA32

boards/qemu/qemu_x86/board.yml

@@ -0,0 +1,30 @@
+boards:
+
+  - name: qemu_x86
+    socs:
+      - name: ia32
+        variants:
+        - name: 'nokpti'
+        - name: 'nommu'
+        - name: 'nopae'
+        - name: 'virt'
+        - name: 'xip'
+
+  - name: qemu_x86_lakemont
+    socs:
+      - name: lakemont
+
+  - name: qemu_x86_64
+    socs:
+      - name: ia32
+        variants:
+        - name: 'nokpti'
+
+  - name: qemu_x86_tiny
+    socs:
+      - name: ia32
+    revision:
+      format: custom
+      default: ''
+      revisions:
+        - name: '768'

boards/qemu/qemu_x86/qemu_x86_64_defconfig

@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_IA32=y
-CONFIG_BOARD_QEMU_X86_64=y
 CONFIG_PIC_DISABLE=y
 CONFIG_LOAPIC=y
 CONFIG_CONSOLE=y

boards/qemu/qemu_x86/qemu_x86_64_ia32_nokpti.yaml

@@ -1,4 +1,4 @@
-identifier: qemu_x86_64_nokpti
+identifier: qemu_x86_64/ia32/nokpti
 name: QEMU Emulation for X86_64 (KPTI disabled)
 type: qemu
 arch: x86

boards/qemu/qemu_x86/qemu_x86_64_ia32_nokpti_defconfig

@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_IA32=y
-CONFIG_BOARD_QEMU_X86_64=y
 CONFIG_PIC_DISABLE=y
 CONFIG_LOAPIC=y
 CONFIG_CONSOLE=y

boards/qemu/qemu_x86/qemu_x86_defconfig

@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_IA32=y
-CONFIG_BOARD_QEMU_X86=y
 CONFIG_PIC_DISABLE=y
 CONFIG_LOAPIC=y
 CONFIG_CONSOLE=y

boards/qemu/qemu_x86/qemu_x86_ia32_nokpti.yaml

@@ -1,4 +1,4 @@
-identifier: qemu_x86_nokpti
+identifier: qemu_x86/ia32/nokpti
 name: QEMU Emulation for X86 (KPTI disabled)
 type: qemu
 arch: x86

boards/qemu/qemu_x86/qemu_x86_ia32_nokpti_defconfig

@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_IA32=y
-CONFIG_BOARD_QEMU_X86=y
 CONFIG_PIC_DISABLE=y
 CONFIG_LOAPIC=y
 CONFIG_CONSOLE=y

boards/qemu/qemu_x86/qemu_x86_ia32_nommu.yaml

@@ -1,4 +1,4 @@
-identifier: qemu_x86_nommu
+identifier: qemu_x86/ia32/nommu
 name: QEMU Emulation for X86 (MMU disabled)
 type: qemu
 arch: x86

boards/qemu/qemu_x86/qemu_x86_ia32_nommu_defconfig

@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_IA32=y
-CONFIG_BOARD_QEMU_X86=y
 CONFIG_PIC_DISABLE=y
 CONFIG_LOAPIC=y
 CONFIG_CONSOLE=y

boards/qemu/qemu_x86/qemu_x86_ia32_nopae.yaml

@@ -1,4 +1,4 @@
-identifier: qemu_x86_nopae
+identifier: qemu_x86/ia32/nopae
 name: QEMU Emulation for X86 (32-bit page tables)
 type: qemu
 arch: x86

boards/qemu/qemu_x86/qemu_x86_ia32_nopae_defconfig

@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_IA32=y
-CONFIG_BOARD_QEMU_X86=y
 CONFIG_PIC_DISABLE=y
 CONFIG_LOAPIC=y
 CONFIG_CONSOLE=y

boards/qemu/qemu_x86/qemu_x86_ia32_virt.yaml

@@ -1,4 +1,4 @@
-identifier: qemu_x86_virt
+identifier: qemu_x86/ia32/virt
 name: QEMU Emulation for X86 (Run in Virtual Address Space)
 type: qemu
 arch: x86

boards/qemu/qemu_x86/qemu_x86_ia32_virt_defconfig

@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_IA32=y
-CONFIG_BOARD_QEMU_X86=y
 CONFIG_PIC_DISABLE=y
 CONFIG_LOAPIC=y
 CONFIG_CONSOLE=y

boards/qemu/qemu_x86/qemu_x86_ia32_xip.yaml

@@ -1,4 +1,4 @@
-identifier: qemu_x86_xip
+identifier: qemu_x86/ia32/xip
 name: QEMU Emulation for X86 (XIP enabled)
 type: qemu
 arch: x86

boards/qemu/qemu_x86/qemu_x86_ia32_xip_defconfig

@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_IA32=y
-CONFIG_BOARD_QEMU_X86=y
 CONFIG_PIC_DISABLE=y
 CONFIG_LOAPIC=y
 CONFIG_CONSOLE=y

boards/qemu/qemu_x86/qemu_x86_lakemont_defconfig

@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_LAKEMONT=y
-CONFIG_BOARD_QEMU_X86_LAKEMONT=y
 CONFIG_PIC_DISABLE=y
 CONFIG_LOAPIC=y
 CONFIG_CONSOLE=y

boards/qemu/qemu_x86/qemu_x86_tiny_defconfig

@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_IA32=y
-CONFIG_BOARD_QEMU_X86_TINY=y
 CONFIG_PIC_DISABLE=y
 CONFIG_LOAPIC=y
 CONFIG_CONSOLE=y