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//nokpti Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
zephyrproject-rtos · Jan 25, 2024 · dcd3130 · dcd3130
1 parent 5c7817c
commit dcd3130
Show file tree

Hide file tree

Showing 44 changed files with 73 additions and 56 deletions.
diff --git a/boards/x86/qemu_x86/CMakeLists.txt → boards/v2/qemu/qemu_x86/CMakeLists.txt b/boards/x86/qemu_x86/CMakeLists.txt → boards/v2/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

diff --git a/boards/x86/qemu_x86/Kconfig.defconfig → boards/v2/qemu/qemu_x86/Kconfig.defconfig b/boards/x86/qemu_x86/Kconfig.defconfig → boards/v2/qemu/qemu_x86/Kconfig.defconfig
@@ -10,13 +10,22 @@ 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
  default "qemu_x86"
 
+config CPU_HAS_FPU
+ default y
+
 config FLASH_SIMULATOR
  default y
  depends on FLASH
@@ -46,6 +55,9 @@ if BOARD_QEMU_X86_64
 config BOARD
  default "qemu_x86_64"
 
+config X86_64
+ default y
+
 config KERNEL_VM_SIZE
  default 0x10000000 if ACPI
 
@@ -56,6 +68,9 @@ if BOARD_QEMU_X86_LAKEMONT
 config BOARD
  default "qemu_x86_lakemont"
 
+config CPU_HAS_FPU
+ default y
+
 config KERNEL_VM_SIZE
  default 0x400000
 
@@ -80,6 +95,9 @@ if BOARD_QEMU_X86_TINY
 config BOARD
  default "qemu_x86_tiny"
 
+config CPU_HAS_FPU
+ default y
+
 config KERNEL_VM_SIZE
  default 0x400000
 
@@ -101,7 +119,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/v2/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

diff --git a/boards/v2/qemu/qemu_x86/Kconfig.qemu_x86 b/boards/v2/qemu/qemu_x86/Kconfig.qemu_x86
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_QEMU_X86
+ select SOC_IA32
diff --git a/boards/v2/qemu/qemu_x86/Kconfig.qemu_x86_64 b/boards/v2/qemu/qemu_x86/Kconfig.qemu_x86_64
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_QEMU_X86_64
+ select SOC_IA32
diff --git a/boards/v2/qemu/qemu_x86/Kconfig.qemu_x86_lakemont b/boards/v2/qemu/qemu_x86/Kconfig.qemu_x86_lakemont
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_QEMU_X86_LAKEMONT
+ select SOC_LAKEMONT
diff --git a/boards/v2/qemu/qemu_x86/Kconfig.qemu_x86_tiny b/boards/v2/qemu/qemu_x86/Kconfig.qemu_x86_tiny
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_QEMU_X86_TINY
+ select SOC_IA32
diff --git a/boards/x86/qemu_x86/board.cmake → boards/v2/qemu/qemu_x86/board.cmake b/boards/x86/qemu_x86/board.cmake → boards/v2/qemu/qemu_x86/board.cmake
diff --git a/boards/v2/qemu/qemu_x86/board.yml b/boards/v2/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'
diff --git a/boards/x86/qemu_x86/doc/index.rst → boards/v2/qemu/qemu_x86/doc/index.rst b/boards/x86/qemu_x86/doc/index.rst → boards/v2/qemu/qemu_x86/doc/index.rst
diff --git a/boards/x86/qemu_x86/qemu_x86.dts → boards/v2/qemu/qemu_x86/qemu_x86.dts b/boards/x86/qemu_x86/qemu_x86.dts → boards/v2/qemu/qemu_x86/qemu_x86.dts
diff --git a/boards/x86/qemu_x86/qemu_x86.yaml → boards/v2/qemu/qemu_x86/qemu_x86.yaml b/boards/x86/qemu_x86/qemu_x86.yaml → boards/v2/qemu/qemu_x86/qemu_x86.yaml
diff --git a/boards/x86/qemu_x86/qemu_x86_64.dts → boards/v2/qemu/qemu_x86/qemu_x86_64.dts b/boards/x86/qemu_x86/qemu_x86_64.dts → boards/v2/qemu/qemu_x86/qemu_x86_64.dts
diff --git a/boards/x86/qemu_x86/qemu_x86_64.yaml → boards/v2/qemu/qemu_x86/qemu_x86_64.yaml b/boards/x86/qemu_x86/qemu_x86_64.yaml → boards/v2/qemu/qemu_x86/qemu_x86_64.yaml
diff --git a/boards/x86/qemu_x86/qemu_x86_64_defconfig → ...ds/v2/qemu/qemu_x86/qemu_x86_64_defconfig b/boards/x86/qemu_x86/qemu_x86_64_defconfig → ...ds/v2/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

diff --git a/boards/x86/qemu_x86/qemu_x86_64_nokpti.dts → ...s/v2/qemu/qemu_x86/qemu_x86_64_nokpti.dts b/boards/x86/qemu_x86/qemu_x86_64_nokpti.dts → ...s/v2/qemu/qemu_x86/qemu_x86_64_nokpti.dts
diff --git a/boards/x86/qemu_x86/qemu_x86_64_nokpti.yaml → .../v2/qemu/qemu_x86/qemu_x86_64_nokpti.yaml b/boards/x86/qemu_x86/qemu_x86_64_nokpti.yaml → .../v2/qemu/qemu_x86/qemu_x86_64_nokpti.yaml
@@ -1,4 +1,4 @@
-identifier: qemu_x86_64_nokpti
+identifier: qemu_x86_64//nokpti
 name: QEMU Emulation for X86_64 (KPTI disabled)
 type: qemu
 arch: x86

diff --git a/...x86/qemu_x86/qemu_x86_64_nokpti_defconfig → ...emu/qemu_x86/qemu_x86_64_nokpti_defconfig b/...x86/qemu_x86/qemu_x86_64_nokpti_defconfig → ...emu/qemu_x86/qemu_x86_64_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

diff --git a/boards/x86/qemu_x86/qemu_x86_defconfig → boards/v2/qemu/qemu_x86/qemu_x86_defconfig b/boards/x86/qemu_x86/qemu_x86_defconfig → boards/v2/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

diff --git a/boards/x86/qemu_x86/qemu_x86_lakemont.dts → ...ds/v2/qemu/qemu_x86/qemu_x86_lakemont.dts b/boards/x86/qemu_x86/qemu_x86_lakemont.dts → ...ds/v2/qemu/qemu_x86/qemu_x86_lakemont.dts
diff --git a/boards/x86/qemu_x86/qemu_x86_lakemont.yaml → ...s/v2/qemu/qemu_x86/qemu_x86_lakemont.yaml b/boards/x86/qemu_x86/qemu_x86_lakemont.yaml → ...s/v2/qemu/qemu_x86/qemu_x86_lakemont.yaml
diff --git a/.../x86/qemu_x86/qemu_x86_lakemont_defconfig → ...qemu/qemu_x86/qemu_x86_lakemont_defconfig b/.../x86/qemu_x86/qemu_x86_lakemont_defconfig → ...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

diff --git a/boards/x86/qemu_x86/qemu_x86_nokpti.dts → boards/v2/qemu/qemu_x86/qemu_x86_nokpti.dts b/boards/x86/qemu_x86/qemu_x86_nokpti.dts → boards/v2/qemu/qemu_x86/qemu_x86_nokpti.dts
diff --git a/boards/x86/qemu_x86/qemu_x86_nokpti.yaml → boards/v2/qemu/qemu_x86/qemu_x86_nokpti.yaml b/boards/x86/qemu_x86/qemu_x86_nokpti.yaml → boards/v2/qemu/qemu_x86/qemu_x86_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

diff --git a/...ds/x86/qemu_x86/qemu_x86_nokpti_defconfig → ...2/qemu/qemu_x86/qemu_x86_nokpti_defconfig b/...ds/x86/qemu_x86/qemu_x86_nokpti_defconfig → ...2/qemu/qemu_x86/qemu_x86_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

diff --git a/boards/x86/qemu_x86/qemu_x86_nommu.dts → boards/v2/qemu/qemu_x86/qemu_x86_nommu.dts b/boards/x86/qemu_x86/qemu_x86_nommu.dts → boards/v2/qemu/qemu_x86/qemu_x86_nommu.dts
diff --git a/boards/x86/qemu_x86/qemu_x86_nommu.yaml → boards/v2/qemu/qemu_x86/qemu_x86_nommu.yaml b/boards/x86/qemu_x86/qemu_x86_nommu.yaml → boards/v2/qemu/qemu_x86/qemu_x86_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

diff --git a/boards/x86/qemu_x86/qemu_x86_nommu_defconfig → ...v2/qemu/qemu_x86/qemu_x86_nommu_defconfig b/boards/x86/qemu_x86/qemu_x86_nommu_defconfig → ...v2/qemu/qemu_x86/qemu_x86_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

diff --git a/boards/x86/qemu_x86/qemu_x86_nopae.dts → boards/v2/qemu/qemu_x86/qemu_x86_nopae.dts b/boards/x86/qemu_x86/qemu_x86_nopae.dts → boards/v2/qemu/qemu_x86/qemu_x86_nopae.dts
diff --git a/boards/x86/qemu_x86/qemu_x86_nopae.yaml → boards/v2/qemu/qemu_x86/qemu_x86_nopae.yaml b/boards/x86/qemu_x86/qemu_x86_nopae.yaml → boards/v2/qemu/qemu_x86/qemu_x86_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

diff --git a/boards/x86/qemu_x86/qemu_x86_nopae_defconfig → ...v2/qemu/qemu_x86/qemu_x86_nopae_defconfig b/boards/x86/qemu_x86/qemu_x86_nopae_defconfig → ...v2/qemu/qemu_x86/qemu_x86_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

diff --git a/boards/x86/qemu_x86/qemu_x86_tiny.dts → boards/v2/qemu/qemu_x86/qemu_x86_tiny.dts b/boards/x86/qemu_x86/qemu_x86_tiny.dts → boards/v2/qemu/qemu_x86/qemu_x86_tiny.dts
diff --git a/boards/x86/qemu_x86/qemu_x86_tiny.ld → boards/v2/qemu/qemu_x86/qemu_x86_tiny.ld b/boards/x86/qemu_x86/qemu_x86_tiny.ld → boards/v2/qemu/qemu_x86/qemu_x86_tiny.ld
diff --git a/boards/x86/qemu_x86/qemu_x86_tiny.yaml → boards/v2/qemu/qemu_x86/qemu_x86_tiny.yaml b/boards/x86/qemu_x86/qemu_x86_tiny.yaml → boards/v2/qemu/qemu_x86/qemu_x86_tiny.yaml
diff --git a/boards/x86/qemu_x86/qemu_x86_tiny_768.conf → ...s/v2/qemu/qemu_x86/qemu_x86_tiny_768.conf b/boards/x86/qemu_x86/qemu_x86_tiny_768.conf → ...s/v2/qemu/qemu_x86/qemu_x86_tiny_768.conf
diff --git a/...ds/x86/qemu_x86/qemu_x86_tiny_768.overlay → ...2/qemu/qemu_x86/qemu_x86_tiny_768.overlay b/...ds/x86/qemu_x86/qemu_x86_tiny_768.overlay → ...2/qemu/qemu_x86/qemu_x86_tiny_768.overlay
diff --git a/boards/x86/qemu_x86/qemu_x86_tiny_defconfig → .../v2/qemu/qemu_x86/qemu_x86_tiny_defconfig b/boards/x86/qemu_x86/qemu_x86_tiny_defconfig → .../v2/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

diff --git a/boards/x86/qemu_x86/qemu_x86_virt.dts → boards/v2/qemu/qemu_x86/qemu_x86_virt.dts b/boards/x86/qemu_x86/qemu_x86_virt.dts → boards/v2/qemu/qemu_x86/qemu_x86_virt.dts
diff --git a/boards/x86/qemu_x86/qemu_x86_virt.yaml → boards/v2/qemu/qemu_x86/qemu_x86_virt.yaml b/boards/x86/qemu_x86/qemu_x86_virt.yaml → boards/v2/qemu/qemu_x86/qemu_x86_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

diff --git a/boards/x86/qemu_x86/qemu_x86_virt_defconfig → .../v2/qemu/qemu_x86/qemu_x86_virt_defconfig b/boards/x86/qemu_x86/qemu_x86_virt_defconfig → .../v2/qemu/qemu_x86/qemu_x86_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

diff --git a/boards/x86/qemu_x86/qemu_x86_xip.dts → boards/v2/qemu/qemu_x86/qemu_x86_xip.dts b/boards/x86/qemu_x86/qemu_x86_xip.dts → boards/v2/qemu/qemu_x86/qemu_x86_xip.dts
diff --git a/boards/x86/qemu_x86/qemu_x86_xip.yaml → boards/v2/qemu/qemu_x86/qemu_x86_xip.yaml b/boards/x86/qemu_x86/qemu_x86_xip.yaml → boards/v2/qemu/qemu_x86/qemu_x86_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

diff --git a/boards/x86/qemu_x86/qemu_x86_xip_defconfig → ...s/v2/qemu/qemu_x86/qemu_x86_xip_defconfig b/boards/x86/qemu_x86/qemu_x86_xip_defconfig → ...s/v2/qemu/qemu_x86/qemu_x86_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

diff --git a/boards/x86/qemu_x86/revision.cmake → boards/v2/qemu/qemu_x86/revision.cmake b/boards/x86/qemu_x86/revision.cmake → boards/v2/qemu/qemu_x86/revision.cmake
diff --git a/boards/x86/qemu_x86/Kconfig.board b/boards/x86/qemu_x86/Kconfig.board