From 6f1043cde6018161b82346aa110e43d07e9db229 Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Mon, 5 Feb 2024 12:42:34 +0100 Subject: [PATCH] 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 --- .../boards_legacy/x86/qemu_x86/Kconfig.board | 29 ------------------ .../x86 => qemu}/qemu_x86/CMakeLists.txt | 2 ++ boards/qemu/qemu_x86/Kconfig | 19 ++++++++++++ .../x86 => qemu}/qemu_x86/Kconfig.defconfig | 24 +++++++-------- boards/qemu/qemu_x86/Kconfig.qemu_x86 | 6 ++++ boards/qemu/qemu_x86/Kconfig.qemu_x86_64 | 6 ++++ .../qemu/qemu_x86/Kconfig.qemu_x86_lakemont | 6 ++++ boards/qemu/qemu_x86/Kconfig.qemu_x86_tiny | 6 ++++ .../x86 => qemu}/qemu_x86/board.cmake | 0 boards/qemu/qemu_x86/board.yml | 30 +++++++++++++++++++ .../x86 => qemu}/qemu_x86/doc/index.rst | 0 .../x86 => qemu}/qemu_x86/qemu_x86.dts | 0 .../x86 => qemu}/qemu_x86/qemu_x86.yaml | 0 .../x86 => qemu}/qemu_x86/qemu_x86_64.dts | 0 .../x86 => qemu}/qemu_x86/qemu_x86_64.yaml | 0 .../qemu_x86/qemu_x86_64_defconfig | 2 -- .../qemu_x86/qemu_x86_64_ia32_nokpti.dts} | 0 .../qemu_x86/qemu_x86_64_ia32_nokpti.yaml} | 2 +- .../qemu_x86_64_ia32_nokpti_defconfig} | 2 -- .../x86 => qemu}/qemu_x86/qemu_x86_defconfig | 2 -- .../qemu_x86/qemu_x86_ia32_nokpti.dts} | 0 .../qemu_x86/qemu_x86_ia32_nokpti.yaml} | 2 +- .../qemu_x86/qemu_x86_ia32_nokpti_defconfig} | 2 -- .../qemu_x86/qemu_x86_ia32_nommu.dts} | 0 .../qemu_x86/qemu_x86_ia32_nommu.yaml} | 2 +- .../qemu_x86/qemu_x86_ia32_nommu_defconfig} | 2 -- .../qemu_x86/qemu_x86_ia32_nopae.dts} | 0 .../qemu_x86/qemu_x86_ia32_nopae.yaml} | 2 +- .../qemu_x86/qemu_x86_ia32_nopae_defconfig} | 2 -- .../qemu_x86/qemu_x86_ia32_virt.dts} | 0 .../qemu_x86/qemu_x86_ia32_virt.yaml} | 2 +- .../qemu_x86/qemu_x86_ia32_virt_defconfig} | 2 -- .../qemu_x86/qemu_x86_ia32_xip.dts} | 0 .../qemu_x86/qemu_x86_ia32_xip.yaml} | 2 +- .../qemu_x86/qemu_x86_ia32_xip_defconfig} | 2 -- .../qemu_x86/qemu_x86_lakemont.dts | 0 .../qemu_x86/qemu_x86_lakemont.yaml | 0 .../qemu_x86/qemu_x86_lakemont_defconfig | 2 -- .../x86 => qemu}/qemu_x86/qemu_x86_tiny.dts | 0 .../x86 => qemu}/qemu_x86/qemu_x86_tiny.ld | 0 .../x86 => qemu}/qemu_x86/qemu_x86_tiny.yaml | 0 .../qemu_x86/qemu_x86_tiny_768.conf | 0 .../qemu_x86/qemu_x86_tiny_768.overlay | 0 .../qemu_x86/qemu_x86_tiny_defconfig | 2 -- .../x86 => qemu}/qemu_x86/revision.cmake | 0 45 files changed, 92 insertions(+), 68 deletions(-) delete mode 100644 boards/boards_legacy/x86/qemu_x86/Kconfig.board rename boards/{boards_legacy/x86 => qemu}/qemu_x86/CMakeLists.txt (91%) create mode 100644 boards/qemu/qemu_x86/Kconfig rename boards/{boards_legacy/x86 => qemu}/qemu_x86/Kconfig.defconfig (90%) create mode 100644 boards/qemu/qemu_x86/Kconfig.qemu_x86 create mode 100644 boards/qemu/qemu_x86/Kconfig.qemu_x86_64 create mode 100644 boards/qemu/qemu_x86/Kconfig.qemu_x86_lakemont create mode 100644 boards/qemu/qemu_x86/Kconfig.qemu_x86_tiny rename boards/{boards_legacy/x86 => qemu}/qemu_x86/board.cmake (100%) create mode 100644 boards/qemu/qemu_x86/board.yml rename boards/{boards_legacy/x86 => qemu}/qemu_x86/doc/index.rst (100%) rename boards/{boards_legacy/x86 => qemu}/qemu_x86/qemu_x86.dts (100%) rename boards/{boards_legacy/x86 => qemu}/qemu_x86/qemu_x86.yaml (100%) rename boards/{boards_legacy/x86 => qemu}/qemu_x86/qemu_x86_64.dts (100%) rename boards/{boards_legacy/x86 => qemu}/qemu_x86/qemu_x86_64.yaml (100%) rename boards/{boards_legacy/x86 => qemu}/qemu_x86/qemu_x86_64_defconfig (88%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_64_nokpti.dts => qemu/qemu_x86/qemu_x86_64_ia32_nokpti.dts} (100%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_64_nokpti.yaml => qemu/qemu_x86/qemu_x86_64_ia32_nokpti.yaml} (87%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_64_nokpti_defconfig => qemu/qemu_x86/qemu_x86_64_ia32_nokpti_defconfig} (88%) rename boards/{boards_legacy/x86 => qemu}/qemu_x86/qemu_x86_defconfig (88%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_nokpti.dts => qemu/qemu_x86/qemu_x86_ia32_nokpti.dts} (100%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_nokpti.yaml => qemu/qemu_x86/qemu_x86_ia32_nokpti.yaml} (87%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_nokpti_defconfig => qemu/qemu_x86/qemu_x86_ia32_nokpti_defconfig} (89%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_nommu.dts => qemu/qemu_x86/qemu_x86_ia32_nommu.dts} (100%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_nommu.yaml => qemu/qemu_x86/qemu_x86_ia32_nommu.yaml} (85%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_nommu_defconfig => qemu/qemu_x86/qemu_x86_ia32_nommu_defconfig} (84%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_nopae.dts => qemu/qemu_x86/qemu_x86_ia32_nopae.dts} (100%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_nopae.yaml => qemu/qemu_x86/qemu_x86_ia32_nopae.yaml} (87%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_nopae_defconfig => qemu/qemu_x86/qemu_x86_ia32_nopae_defconfig} (89%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_virt.dts => qemu/qemu_x86/qemu_x86_ia32_virt.dts} (100%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_virt.yaml => qemu/qemu_x86/qemu_x86_ia32_virt.yaml} (88%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_virt_defconfig => qemu/qemu_x86/qemu_x86_ia32_virt_defconfig} (92%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_xip.dts => qemu/qemu_x86/qemu_x86_ia32_xip.dts} (100%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_xip.yaml => qemu/qemu_x86/qemu_x86_ia32_xip.yaml} (85%) rename boards/{boards_legacy/x86/qemu_x86/qemu_x86_xip_defconfig => qemu/qemu_x86/qemu_x86_ia32_xip_defconfig} (88%) rename boards/{boards_legacy/x86 => qemu}/qemu_x86/qemu_x86_lakemont.dts (100%) rename boards/{boards_legacy/x86 => qemu}/qemu_x86/qemu_x86_lakemont.yaml (100%) rename boards/{boards_legacy/x86 => qemu}/qemu_x86/qemu_x86_lakemont_defconfig (85%) rename boards/{boards_legacy/x86 => qemu}/qemu_x86/qemu_x86_tiny.dts (100%) rename boards/{boards_legacy/x86 => qemu}/qemu_x86/qemu_x86_tiny.ld (100%) rename boards/{boards_legacy/x86 => qemu}/qemu_x86/qemu_x86_tiny.yaml (100%) rename boards/{boards_legacy/x86 => qemu}/qemu_x86/qemu_x86_tiny_768.conf (100%) rename boards/{boards_legacy/x86 => qemu}/qemu_x86/qemu_x86_tiny_768.overlay (100%) rename boards/{boards_legacy/x86 => qemu}/qemu_x86/qemu_x86_tiny_defconfig (93%) rename boards/{boards_legacy/x86 => qemu}/qemu_x86/revision.cmake (100%) diff --git a/boards/boards_legacy/x86/qemu_x86/Kconfig.board b/boards/boards_legacy/x86/qemu_x86/Kconfig.board deleted file mode 100644 index 275d1c69757..00000000000 --- a/boards/boards_legacy/x86/qemu_x86/Kconfig.board +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/x86/qemu_x86/CMakeLists.txt b/boards/qemu/qemu_x86/CMakeLists.txt similarity index 91% rename from boards/boards_legacy/x86/qemu_x86/CMakeLists.txt rename to boards/qemu/qemu_x86/CMakeLists.txt index de31c25a82e..4fdda0d0ec1 100644 --- a/boards/boards_legacy/x86/qemu_x86/CMakeLists.txt +++ b/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 diff --git a/boards/qemu/qemu_x86/Kconfig b/boards/qemu/qemu_x86/Kconfig new file mode 100644 index 00000000000..092f34f453d --- /dev/null +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/Kconfig.defconfig b/boards/qemu/qemu_x86/Kconfig.defconfig similarity index 90% rename from boards/boards_legacy/x86/qemu_x86/Kconfig.defconfig rename to boards/qemu/qemu_x86/Kconfig.defconfig index 1e2b7af0a4d..45c5cf55701 100644 --- a/boards/boards_legacy/x86/qemu_x86/Kconfig.defconfig +++ b/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 - default "qemu_x86" +if BOARD_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 - default "qemu_x86_64" +if BOARD_QEMU_X86_64 config KERNEL_VM_SIZE default 0x10000000 if ACPI endif # BOARD_QEMU_X86_64 -if BOARD_QEMU_X86_LAKEMONT -config BOARD - default "qemu_x86_lakemont" +if BOARD_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 - default "qemu_x86_tiny" +if BOARD_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 diff --git a/boards/qemu/qemu_x86/Kconfig.qemu_x86 b/boards/qemu/qemu_x86/Kconfig.qemu_x86 new file mode 100644 index 00000000000..2a46807a359 --- /dev/null +++ b/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 diff --git a/boards/qemu/qemu_x86/Kconfig.qemu_x86_64 b/boards/qemu/qemu_x86/Kconfig.qemu_x86_64 new file mode 100644 index 00000000000..d4253560eaf --- /dev/null +++ b/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 diff --git a/boards/qemu/qemu_x86/Kconfig.qemu_x86_lakemont b/boards/qemu/qemu_x86/Kconfig.qemu_x86_lakemont new file mode 100644 index 00000000000..f48e1b99c2a --- /dev/null +++ b/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 diff --git a/boards/qemu/qemu_x86/Kconfig.qemu_x86_tiny b/boards/qemu/qemu_x86/Kconfig.qemu_x86_tiny new file mode 100644 index 00000000000..c3bac576fdc --- /dev/null +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/board.cmake b/boards/qemu/qemu_x86/board.cmake similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/board.cmake rename to boards/qemu/qemu_x86/board.cmake diff --git a/boards/qemu/qemu_x86/board.yml b/boards/qemu/qemu_x86/board.yml new file mode 100644 index 00000000000..6ee6b426af5 --- /dev/null +++ b/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' diff --git a/boards/boards_legacy/x86/qemu_x86/doc/index.rst b/boards/qemu/qemu_x86/doc/index.rst similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/doc/index.rst rename to boards/qemu/qemu_x86/doc/index.rst diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86.dts b/boards/qemu/qemu_x86/qemu_x86.dts similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86.dts rename to boards/qemu/qemu_x86/qemu_x86.dts diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86.yaml b/boards/qemu/qemu_x86/qemu_x86.yaml similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86.yaml rename to boards/qemu/qemu_x86/qemu_x86.yaml diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_64.dts b/boards/qemu/qemu_x86/qemu_x86_64.dts similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_64.dts rename to boards/qemu/qemu_x86/qemu_x86_64.dts diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_64.yaml b/boards/qemu/qemu_x86/qemu_x86_64.yaml similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_64.yaml rename to boards/qemu/qemu_x86/qemu_x86_64.yaml diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_64_defconfig b/boards/qemu/qemu_x86/qemu_x86_64_defconfig similarity index 88% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_64_defconfig rename to boards/qemu/qemu_x86/qemu_x86_64_defconfig index 9f37e55e138..e6f714dbf15 100644 --- a/boards/boards_legacy/x86/qemu_x86/qemu_x86_64_defconfig +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_64_nokpti.dts b/boards/qemu/qemu_x86/qemu_x86_64_ia32_nokpti.dts similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_64_nokpti.dts rename to boards/qemu/qemu_x86/qemu_x86_64_ia32_nokpti.dts diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_64_nokpti.yaml b/boards/qemu/qemu_x86/qemu_x86_64_ia32_nokpti.yaml similarity index 87% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_64_nokpti.yaml rename to boards/qemu/qemu_x86/qemu_x86_64_ia32_nokpti.yaml index 531ebd4d3e1..0fb239753dd 100644 --- a/boards/boards_legacy/x86/qemu_x86/qemu_x86_64_nokpti.yaml +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_64_nokpti_defconfig b/boards/qemu/qemu_x86/qemu_x86_64_ia32_nokpti_defconfig similarity index 88% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_64_nokpti_defconfig rename to boards/qemu/qemu_x86/qemu_x86_64_ia32_nokpti_defconfig index 1ca8daa5fa1..eed04c2e2f2 100644 --- a/boards/boards_legacy/x86/qemu_x86/qemu_x86_64_nokpti_defconfig +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_defconfig b/boards/qemu/qemu_x86/qemu_x86_defconfig similarity index 88% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_defconfig rename to boards/qemu/qemu_x86/qemu_x86_defconfig index 75320082a68..84a5f04dc3f 100644 --- a/boards/boards_legacy/x86/qemu_x86/qemu_x86_defconfig +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_nokpti.dts b/boards/qemu/qemu_x86/qemu_x86_ia32_nokpti.dts similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_nokpti.dts rename to boards/qemu/qemu_x86/qemu_x86_ia32_nokpti.dts diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_nokpti.yaml b/boards/qemu/qemu_x86/qemu_x86_ia32_nokpti.yaml similarity index 87% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_nokpti.yaml rename to boards/qemu/qemu_x86/qemu_x86_ia32_nokpti.yaml index 75ab0d13d5f..9e65d46dcef 100644 --- a/boards/boards_legacy/x86/qemu_x86/qemu_x86_nokpti.yaml +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_nokpti_defconfig b/boards/qemu/qemu_x86/qemu_x86_ia32_nokpti_defconfig similarity index 89% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_nokpti_defconfig rename to boards/qemu/qemu_x86/qemu_x86_ia32_nokpti_defconfig index 5423b62b679..c358872a228 100644 --- a/boards/boards_legacy/x86/qemu_x86/qemu_x86_nokpti_defconfig +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_nommu.dts b/boards/qemu/qemu_x86/qemu_x86_ia32_nommu.dts similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_nommu.dts rename to boards/qemu/qemu_x86/qemu_x86_ia32_nommu.dts diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_nommu.yaml b/boards/qemu/qemu_x86/qemu_x86_ia32_nommu.yaml similarity index 85% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_nommu.yaml rename to boards/qemu/qemu_x86/qemu_x86_ia32_nommu.yaml index 8d7aee97b7e..b702bcf7fc1 100644 --- a/boards/boards_legacy/x86/qemu_x86/qemu_x86_nommu.yaml +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_nommu_defconfig b/boards/qemu/qemu_x86/qemu_x86_ia32_nommu_defconfig similarity index 84% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_nommu_defconfig rename to boards/qemu/qemu_x86/qemu_x86_ia32_nommu_defconfig index d485369c6cb..049f30ace64 100644 --- a/boards/boards_legacy/x86/qemu_x86/qemu_x86_nommu_defconfig +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_nopae.dts b/boards/qemu/qemu_x86/qemu_x86_ia32_nopae.dts similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_nopae.dts rename to boards/qemu/qemu_x86/qemu_x86_ia32_nopae.dts diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_nopae.yaml b/boards/qemu/qemu_x86/qemu_x86_ia32_nopae.yaml similarity index 87% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_nopae.yaml rename to boards/qemu/qemu_x86/qemu_x86_ia32_nopae.yaml index 7dbd449cebc..91d25beaad2 100644 --- a/boards/boards_legacy/x86/qemu_x86/qemu_x86_nopae.yaml +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_nopae_defconfig b/boards/qemu/qemu_x86/qemu_x86_ia32_nopae_defconfig similarity index 89% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_nopae_defconfig rename to boards/qemu/qemu_x86/qemu_x86_ia32_nopae_defconfig index 15a109c056f..a6a6b7b21be 100644 --- a/boards/boards_legacy/x86/qemu_x86/qemu_x86_nopae_defconfig +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_virt.dts b/boards/qemu/qemu_x86/qemu_x86_ia32_virt.dts similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_virt.dts rename to boards/qemu/qemu_x86/qemu_x86_ia32_virt.dts diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_virt.yaml b/boards/qemu/qemu_x86/qemu_x86_ia32_virt.yaml similarity index 88% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_virt.yaml rename to boards/qemu/qemu_x86/qemu_x86_ia32_virt.yaml index 1f3eb2fb18b..9aa2bdabf9e 100644 --- a/boards/boards_legacy/x86/qemu_x86/qemu_x86_virt.yaml +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_virt_defconfig b/boards/qemu/qemu_x86/qemu_x86_ia32_virt_defconfig similarity index 92% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_virt_defconfig rename to boards/qemu/qemu_x86/qemu_x86_ia32_virt_defconfig index eabfab7a591..34aa8765385 100644 --- a/boards/boards_legacy/x86/qemu_x86/qemu_x86_virt_defconfig +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_xip.dts b/boards/qemu/qemu_x86/qemu_x86_ia32_xip.dts similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_xip.dts rename to boards/qemu/qemu_x86/qemu_x86_ia32_xip.dts diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_xip.yaml b/boards/qemu/qemu_x86/qemu_x86_ia32_xip.yaml similarity index 85% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_xip.yaml rename to boards/qemu/qemu_x86/qemu_x86_ia32_xip.yaml index c33acd4db16..27545e11a4b 100644 --- a/boards/boards_legacy/x86/qemu_x86/qemu_x86_xip.yaml +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_xip_defconfig b/boards/qemu/qemu_x86/qemu_x86_ia32_xip_defconfig similarity index 88% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_xip_defconfig rename to boards/qemu/qemu_x86/qemu_x86_ia32_xip_defconfig index 42fd2677785..9ccb326513f 100644 --- a/boards/boards_legacy/x86/qemu_x86/qemu_x86_xip_defconfig +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_lakemont.dts b/boards/qemu/qemu_x86/qemu_x86_lakemont.dts similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_lakemont.dts rename to boards/qemu/qemu_x86/qemu_x86_lakemont.dts diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_lakemont.yaml b/boards/qemu/qemu_x86/qemu_x86_lakemont.yaml similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_lakemont.yaml rename to boards/qemu/qemu_x86/qemu_x86_lakemont.yaml diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_lakemont_defconfig b/boards/qemu/qemu_x86/qemu_x86_lakemont_defconfig similarity index 85% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_lakemont_defconfig rename to boards/qemu/qemu_x86/qemu_x86_lakemont_defconfig index c4902a34a6c..84a5f04dc3f 100644 --- a/boards/boards_legacy/x86/qemu_x86/qemu_x86_lakemont_defconfig +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_tiny.dts b/boards/qemu/qemu_x86/qemu_x86_tiny.dts similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_tiny.dts rename to boards/qemu/qemu_x86/qemu_x86_tiny.dts diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_tiny.ld b/boards/qemu/qemu_x86/qemu_x86_tiny.ld similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_tiny.ld rename to boards/qemu/qemu_x86/qemu_x86_tiny.ld diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_tiny.yaml b/boards/qemu/qemu_x86/qemu_x86_tiny.yaml similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_tiny.yaml rename to boards/qemu/qemu_x86/qemu_x86_tiny.yaml diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_tiny_768.conf b/boards/qemu/qemu_x86/qemu_x86_tiny_768.conf similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_tiny_768.conf rename to boards/qemu/qemu_x86/qemu_x86_tiny_768.conf diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_tiny_768.overlay b/boards/qemu/qemu_x86/qemu_x86_tiny_768.overlay similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_tiny_768.overlay rename to boards/qemu/qemu_x86/qemu_x86_tiny_768.overlay diff --git a/boards/boards_legacy/x86/qemu_x86/qemu_x86_tiny_defconfig b/boards/qemu/qemu_x86/qemu_x86_tiny_defconfig similarity index 93% rename from boards/boards_legacy/x86/qemu_x86/qemu_x86_tiny_defconfig rename to boards/qemu/qemu_x86/qemu_x86_tiny_defconfig index 8b8111746f6..442e6880c6c 100644 --- a/boards/boards_legacy/x86/qemu_x86/qemu_x86_tiny_defconfig +++ b/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 diff --git a/boards/boards_legacy/x86/qemu_x86/revision.cmake b/boards/qemu/qemu_x86/revision.cmake similarity index 100% rename from boards/boards_legacy/x86/qemu_x86/revision.cmake rename to boards/qemu/qemu_x86/revision.cmake