From 60e6b400f905866db27afc4ddbb0d81a1735b457 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Thu, 15 Feb 2024 09:40:18 -0500 Subject: [PATCH] boards: qemu: move qemu_x86 -> x86 Just follow others and drop qemu_ from the name, we have that in the folder already. Signed-off-by: Anas Nashif --- boards/qemu/{qemu_x86 => x86}/CMakeLists.txt | 0 boards/qemu/{qemu_x86 => x86}/Kconfig | 0 boards/qemu/{qemu_x86 => x86}/Kconfig.defconfig | 2 +- boards/qemu/{qemu_x86 => x86}/Kconfig.qemu_x86 | 0 boards/qemu/{qemu_x86 => x86}/Kconfig.qemu_x86_64 | 0 boards/qemu/{qemu_x86 => x86}/Kconfig.qemu_x86_lakemont | 0 boards/qemu/{qemu_x86 => x86}/Kconfig.qemu_x86_tiny | 0 boards/qemu/{qemu_x86 => x86}/board.cmake | 0 boards/qemu/{qemu_x86 => x86}/board.yml | 0 boards/qemu/{qemu_x86 => x86}/doc/index.rst | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86.dts | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86.yaml | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_64.dts | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_64.yaml | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_64_defconfig | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_64_ia32_nokpti.dts | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_64_ia32_nokpti.yaml | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_64_ia32_nokpti_defconfig | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_defconfig | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nokpti.dts | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nokpti.yaml | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nokpti_defconfig | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nommu.dts | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nommu.yaml | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nommu_defconfig | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nopae.dts | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nopae.yaml | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nopae_defconfig | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_virt.dts | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_virt.yaml | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_virt_defconfig | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_xip.dts | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_xip.yaml | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_xip_defconfig | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_lakemont.dts | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_lakemont.yaml | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_lakemont_defconfig | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_tiny.dts | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_tiny.ld | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_tiny.yaml | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_tiny_defconfig | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_tiny_ia32_768.dts | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_tiny_ia32_768.yaml | 0 boards/qemu/{qemu_x86 => x86}/qemu_x86_tiny_ia32_768_defconfig | 0 boards/qemu/{qemu_x86 => x86}/revision.cmake | 0 45 files changed, 1 insertion(+), 1 deletion(-) rename boards/qemu/{qemu_x86 => x86}/CMakeLists.txt (100%) rename boards/qemu/{qemu_x86 => x86}/Kconfig (100%) rename boards/qemu/{qemu_x86 => x86}/Kconfig.defconfig (96%) rename boards/qemu/{qemu_x86 => x86}/Kconfig.qemu_x86 (100%) rename boards/qemu/{qemu_x86 => x86}/Kconfig.qemu_x86_64 (100%) rename boards/qemu/{qemu_x86 => x86}/Kconfig.qemu_x86_lakemont (100%) rename boards/qemu/{qemu_x86 => x86}/Kconfig.qemu_x86_tiny (100%) rename boards/qemu/{qemu_x86 => x86}/board.cmake (100%) rename boards/qemu/{qemu_x86 => x86}/board.yml (100%) rename boards/qemu/{qemu_x86 => x86}/doc/index.rst (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86.dts (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86.yaml (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_64.dts (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_64.yaml (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_64_defconfig (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_64_ia32_nokpti.dts (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_64_ia32_nokpti.yaml (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_64_ia32_nokpti_defconfig (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_defconfig (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nokpti.dts (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nokpti.yaml (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nokpti_defconfig (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nommu.dts (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nommu.yaml (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nommu_defconfig (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nopae.dts (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nopae.yaml (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_nopae_defconfig (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_virt.dts (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_virt.yaml (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_virt_defconfig (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_xip.dts (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_xip.yaml (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_ia32_xip_defconfig (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_lakemont.dts (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_lakemont.yaml (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_lakemont_defconfig (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_tiny.dts (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_tiny.ld (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_tiny.yaml (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_tiny_defconfig (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_tiny_ia32_768.dts (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_tiny_ia32_768.yaml (100%) rename boards/qemu/{qemu_x86 => x86}/qemu_x86_tiny_ia32_768_defconfig (100%) rename boards/qemu/{qemu_x86 => x86}/revision.cmake (100%) diff --git a/boards/qemu/qemu_x86/CMakeLists.txt b/boards/qemu/x86/CMakeLists.txt similarity index 100% rename from boards/qemu/qemu_x86/CMakeLists.txt rename to boards/qemu/x86/CMakeLists.txt diff --git a/boards/qemu/qemu_x86/Kconfig b/boards/qemu/x86/Kconfig similarity index 100% rename from boards/qemu/qemu_x86/Kconfig rename to boards/qemu/x86/Kconfig diff --git a/boards/qemu/qemu_x86/Kconfig.defconfig b/boards/qemu/x86/Kconfig.defconfig similarity index 96% rename from boards/qemu/qemu_x86/Kconfig.defconfig rename to boards/qemu/x86/Kconfig.defconfig index 45c5cf55701..3747647daf0 100644 --- a/boards/qemu/qemu_x86/Kconfig.defconfig +++ b/boards/qemu/x86/Kconfig.defconfig @@ -99,7 +99,7 @@ config HAVE_CUSTOM_LINKER_SCRIPT default y config CUSTOM_LINKER_SCRIPT - default "${ZEPHYR_BASE}/boards/qemu/qemu_x86/qemu_x86_tiny.ld" + default "${ZEPHYR_BASE}/boards/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/x86/Kconfig.qemu_x86 similarity index 100% rename from boards/qemu/qemu_x86/Kconfig.qemu_x86 rename to boards/qemu/x86/Kconfig.qemu_x86 diff --git a/boards/qemu/qemu_x86/Kconfig.qemu_x86_64 b/boards/qemu/x86/Kconfig.qemu_x86_64 similarity index 100% rename from boards/qemu/qemu_x86/Kconfig.qemu_x86_64 rename to boards/qemu/x86/Kconfig.qemu_x86_64 diff --git a/boards/qemu/qemu_x86/Kconfig.qemu_x86_lakemont b/boards/qemu/x86/Kconfig.qemu_x86_lakemont similarity index 100% rename from boards/qemu/qemu_x86/Kconfig.qemu_x86_lakemont rename to boards/qemu/x86/Kconfig.qemu_x86_lakemont diff --git a/boards/qemu/qemu_x86/Kconfig.qemu_x86_tiny b/boards/qemu/x86/Kconfig.qemu_x86_tiny similarity index 100% rename from boards/qemu/qemu_x86/Kconfig.qemu_x86_tiny rename to boards/qemu/x86/Kconfig.qemu_x86_tiny diff --git a/boards/qemu/qemu_x86/board.cmake b/boards/qemu/x86/board.cmake similarity index 100% rename from boards/qemu/qemu_x86/board.cmake rename to boards/qemu/x86/board.cmake diff --git a/boards/qemu/qemu_x86/board.yml b/boards/qemu/x86/board.yml similarity index 100% rename from boards/qemu/qemu_x86/board.yml rename to boards/qemu/x86/board.yml diff --git a/boards/qemu/qemu_x86/doc/index.rst b/boards/qemu/x86/doc/index.rst similarity index 100% rename from boards/qemu/qemu_x86/doc/index.rst rename to boards/qemu/x86/doc/index.rst diff --git a/boards/qemu/qemu_x86/qemu_x86.dts b/boards/qemu/x86/qemu_x86.dts similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86.dts rename to boards/qemu/x86/qemu_x86.dts diff --git a/boards/qemu/qemu_x86/qemu_x86.yaml b/boards/qemu/x86/qemu_x86.yaml similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86.yaml rename to boards/qemu/x86/qemu_x86.yaml diff --git a/boards/qemu/qemu_x86/qemu_x86_64.dts b/boards/qemu/x86/qemu_x86_64.dts similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_64.dts rename to boards/qemu/x86/qemu_x86_64.dts diff --git a/boards/qemu/qemu_x86/qemu_x86_64.yaml b/boards/qemu/x86/qemu_x86_64.yaml similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_64.yaml rename to boards/qemu/x86/qemu_x86_64.yaml diff --git a/boards/qemu/qemu_x86/qemu_x86_64_defconfig b/boards/qemu/x86/qemu_x86_64_defconfig similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_64_defconfig rename to boards/qemu/x86/qemu_x86_64_defconfig diff --git a/boards/qemu/qemu_x86/qemu_x86_64_ia32_nokpti.dts b/boards/qemu/x86/qemu_x86_64_ia32_nokpti.dts similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_64_ia32_nokpti.dts rename to boards/qemu/x86/qemu_x86_64_ia32_nokpti.dts diff --git a/boards/qemu/qemu_x86/qemu_x86_64_ia32_nokpti.yaml b/boards/qemu/x86/qemu_x86_64_ia32_nokpti.yaml similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_64_ia32_nokpti.yaml rename to boards/qemu/x86/qemu_x86_64_ia32_nokpti.yaml diff --git a/boards/qemu/qemu_x86/qemu_x86_64_ia32_nokpti_defconfig b/boards/qemu/x86/qemu_x86_64_ia32_nokpti_defconfig similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_64_ia32_nokpti_defconfig rename to boards/qemu/x86/qemu_x86_64_ia32_nokpti_defconfig diff --git a/boards/qemu/qemu_x86/qemu_x86_defconfig b/boards/qemu/x86/qemu_x86_defconfig similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_defconfig rename to boards/qemu/x86/qemu_x86_defconfig diff --git a/boards/qemu/qemu_x86/qemu_x86_ia32_nokpti.dts b/boards/qemu/x86/qemu_x86_ia32_nokpti.dts similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_ia32_nokpti.dts rename to boards/qemu/x86/qemu_x86_ia32_nokpti.dts diff --git a/boards/qemu/qemu_x86/qemu_x86_ia32_nokpti.yaml b/boards/qemu/x86/qemu_x86_ia32_nokpti.yaml similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_ia32_nokpti.yaml rename to boards/qemu/x86/qemu_x86_ia32_nokpti.yaml diff --git a/boards/qemu/qemu_x86/qemu_x86_ia32_nokpti_defconfig b/boards/qemu/x86/qemu_x86_ia32_nokpti_defconfig similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_ia32_nokpti_defconfig rename to boards/qemu/x86/qemu_x86_ia32_nokpti_defconfig diff --git a/boards/qemu/qemu_x86/qemu_x86_ia32_nommu.dts b/boards/qemu/x86/qemu_x86_ia32_nommu.dts similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_ia32_nommu.dts rename to boards/qemu/x86/qemu_x86_ia32_nommu.dts diff --git a/boards/qemu/qemu_x86/qemu_x86_ia32_nommu.yaml b/boards/qemu/x86/qemu_x86_ia32_nommu.yaml similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_ia32_nommu.yaml rename to boards/qemu/x86/qemu_x86_ia32_nommu.yaml diff --git a/boards/qemu/qemu_x86/qemu_x86_ia32_nommu_defconfig b/boards/qemu/x86/qemu_x86_ia32_nommu_defconfig similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_ia32_nommu_defconfig rename to boards/qemu/x86/qemu_x86_ia32_nommu_defconfig diff --git a/boards/qemu/qemu_x86/qemu_x86_ia32_nopae.dts b/boards/qemu/x86/qemu_x86_ia32_nopae.dts similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_ia32_nopae.dts rename to boards/qemu/x86/qemu_x86_ia32_nopae.dts diff --git a/boards/qemu/qemu_x86/qemu_x86_ia32_nopae.yaml b/boards/qemu/x86/qemu_x86_ia32_nopae.yaml similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_ia32_nopae.yaml rename to boards/qemu/x86/qemu_x86_ia32_nopae.yaml diff --git a/boards/qemu/qemu_x86/qemu_x86_ia32_nopae_defconfig b/boards/qemu/x86/qemu_x86_ia32_nopae_defconfig similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_ia32_nopae_defconfig rename to boards/qemu/x86/qemu_x86_ia32_nopae_defconfig diff --git a/boards/qemu/qemu_x86/qemu_x86_ia32_virt.dts b/boards/qemu/x86/qemu_x86_ia32_virt.dts similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_ia32_virt.dts rename to boards/qemu/x86/qemu_x86_ia32_virt.dts diff --git a/boards/qemu/qemu_x86/qemu_x86_ia32_virt.yaml b/boards/qemu/x86/qemu_x86_ia32_virt.yaml similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_ia32_virt.yaml rename to boards/qemu/x86/qemu_x86_ia32_virt.yaml diff --git a/boards/qemu/qemu_x86/qemu_x86_ia32_virt_defconfig b/boards/qemu/x86/qemu_x86_ia32_virt_defconfig similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_ia32_virt_defconfig rename to boards/qemu/x86/qemu_x86_ia32_virt_defconfig diff --git a/boards/qemu/qemu_x86/qemu_x86_ia32_xip.dts b/boards/qemu/x86/qemu_x86_ia32_xip.dts similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_ia32_xip.dts rename to boards/qemu/x86/qemu_x86_ia32_xip.dts diff --git a/boards/qemu/qemu_x86/qemu_x86_ia32_xip.yaml b/boards/qemu/x86/qemu_x86_ia32_xip.yaml similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_ia32_xip.yaml rename to boards/qemu/x86/qemu_x86_ia32_xip.yaml diff --git a/boards/qemu/qemu_x86/qemu_x86_ia32_xip_defconfig b/boards/qemu/x86/qemu_x86_ia32_xip_defconfig similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_ia32_xip_defconfig rename to boards/qemu/x86/qemu_x86_ia32_xip_defconfig diff --git a/boards/qemu/qemu_x86/qemu_x86_lakemont.dts b/boards/qemu/x86/qemu_x86_lakemont.dts similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_lakemont.dts rename to boards/qemu/x86/qemu_x86_lakemont.dts diff --git a/boards/qemu/qemu_x86/qemu_x86_lakemont.yaml b/boards/qemu/x86/qemu_x86_lakemont.yaml similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_lakemont.yaml rename to boards/qemu/x86/qemu_x86_lakemont.yaml diff --git a/boards/qemu/qemu_x86/qemu_x86_lakemont_defconfig b/boards/qemu/x86/qemu_x86_lakemont_defconfig similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_lakemont_defconfig rename to boards/qemu/x86/qemu_x86_lakemont_defconfig diff --git a/boards/qemu/qemu_x86/qemu_x86_tiny.dts b/boards/qemu/x86/qemu_x86_tiny.dts similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_tiny.dts rename to boards/qemu/x86/qemu_x86_tiny.dts diff --git a/boards/qemu/qemu_x86/qemu_x86_tiny.ld b/boards/qemu/x86/qemu_x86_tiny.ld similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_tiny.ld rename to boards/qemu/x86/qemu_x86_tiny.ld diff --git a/boards/qemu/qemu_x86/qemu_x86_tiny.yaml b/boards/qemu/x86/qemu_x86_tiny.yaml similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_tiny.yaml rename to boards/qemu/x86/qemu_x86_tiny.yaml diff --git a/boards/qemu/qemu_x86/qemu_x86_tiny_defconfig b/boards/qemu/x86/qemu_x86_tiny_defconfig similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_tiny_defconfig rename to boards/qemu/x86/qemu_x86_tiny_defconfig diff --git a/boards/qemu/qemu_x86/qemu_x86_tiny_ia32_768.dts b/boards/qemu/x86/qemu_x86_tiny_ia32_768.dts similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_tiny_ia32_768.dts rename to boards/qemu/x86/qemu_x86_tiny_ia32_768.dts diff --git a/boards/qemu/qemu_x86/qemu_x86_tiny_ia32_768.yaml b/boards/qemu/x86/qemu_x86_tiny_ia32_768.yaml similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_tiny_ia32_768.yaml rename to boards/qemu/x86/qemu_x86_tiny_ia32_768.yaml diff --git a/boards/qemu/qemu_x86/qemu_x86_tiny_ia32_768_defconfig b/boards/qemu/x86/qemu_x86_tiny_ia32_768_defconfig similarity index 100% rename from boards/qemu/qemu_x86/qemu_x86_tiny_ia32_768_defconfig rename to boards/qemu/x86/qemu_x86_tiny_ia32_768_defconfig diff --git a/boards/qemu/qemu_x86/revision.cmake b/boards/qemu/x86/revision.cmake similarity index 100% rename from boards/qemu/qemu_x86/revision.cmake rename to boards/qemu/x86/revision.cmake