Other QEMU defconfig files use a hyphen between "qemu" and the architecture name, but ARM uses an underscore. Rename the ARM defconfigs for consistency.
Signed-off-by: Bin Meng <[email protected]> --- MAINTAINERS | 2 +- arch/arm/dts/qemu-arm.dts | 2 +- arch/arm/dts/qemu-arm64.dts | 2 +- board/emulation/qemu-arm/MAINTAINERS | 2 +- ...{qemu_arm64_acpi_defconfig => qemu-arm64_acpi_defconfig} | 2 +- configs/{qemu_arm64_defconfig => qemu-arm64_defconfig} | 0 ...{qemu_arm64_lwip_defconfig => qemu-arm64_lwip_defconfig} | 2 +- configs/{qemu_arm_defconfig => qemu-arm_defconfig} | 0 doc/board/emulation/qemu-arm.rst | 6 +++--- doc/develop/driver-model/virtio.rst | 6 +++--- doc/develop/uefi/uefi.rst | 2 +- tools/docker/Dockerfile | 4 ++-- 12 files changed, 15 insertions(+), 15 deletions(-) rename configs/{qemu_arm64_acpi_defconfig => qemu-arm64_acpi_defconfig} (54%) rename configs/{qemu_arm64_defconfig => qemu-arm64_defconfig} (100%) rename configs/{qemu_arm64_lwip_defconfig => qemu-arm64_lwip_defconfig} (80%) rename configs/{qemu_arm_defconfig => qemu-arm_defconfig} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 60772a494a3..1be1003fa5f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1444,7 +1444,7 @@ S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-net.git F: cmd/lwip/ F: cmd/net-lwip.c -F: configs/qemu_arm64_lwip_defconfig +F: configs/qemu-arm64_lwip_defconfig F: drivers/net/sandbox-lwip.c F: include/net-lwip.h F: lib/lwip/Makefile diff --git a/arch/arm/dts/qemu-arm.dts b/arch/arm/dts/qemu-arm.dts index 230c630f04f..cbe023317d7 100644 --- a/arch/arm/dts/qemu-arm.dts +++ b/arch/arm/dts/qemu-arm.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ OR MIT /* - * Empty device tree for qemu_arm + * Empty device tree for qemu-arm * Copyright 2021 Google LLC */ diff --git a/arch/arm/dts/qemu-arm64.dts b/arch/arm/dts/qemu-arm64.dts index 95fcf53ed74..382d131f47f 100644 --- a/arch/arm/dts/qemu-arm64.dts +++ b/arch/arm/dts/qemu-arm64.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ OR MIT /* - * Empty device tree for qemu_arm64 + * Empty device tree for qemu-arm64 * Copyright 2021 Google LLC */ diff --git a/board/emulation/qemu-arm/MAINTAINERS b/board/emulation/qemu-arm/MAINTAINERS index 538769f8040..b2b1fce75cf 100644 --- a/board/emulation/qemu-arm/MAINTAINERS +++ b/board/emulation/qemu-arm/MAINTAINERS @@ -5,5 +5,5 @@ F: board/emulation/qemu-arm/ F: board/emulation/common/ F: include/configs/qemu-arm.h F: include/configs/qemu-sbsa.h -F: configs/qemu_arm* +F: configs/qemu-arm* F: configs/qemu-arm-sbsa_defconfig diff --git a/configs/qemu_arm64_acpi_defconfig b/configs/qemu-arm64_acpi_defconfig similarity index 54% rename from configs/qemu_arm64_acpi_defconfig rename to configs/qemu-arm64_acpi_defconfig index f85f2913530..ef4c9f156c5 100644 --- a/configs/qemu_arm64_acpi_defconfig +++ b/configs/qemu-arm64_acpi_defconfig @@ -1,2 +1,2 @@ -#include <configs/qemu_arm64_defconfig> +#include <configs/qemu-arm64_defconfig> #include <board/emulation/configs/acpi.config> diff --git a/configs/qemu_arm64_defconfig b/configs/qemu-arm64_defconfig similarity index 100% rename from configs/qemu_arm64_defconfig rename to configs/qemu-arm64_defconfig diff --git a/configs/qemu_arm64_lwip_defconfig b/configs/qemu-arm64_lwip_defconfig similarity index 80% rename from configs/qemu_arm64_lwip_defconfig rename to configs/qemu-arm64_lwip_defconfig index e8f976efaf7..c00d0a9da57 100644 --- a/configs/qemu_arm64_lwip_defconfig +++ b/configs/qemu-arm64_lwip_defconfig @@ -1,4 +1,4 @@ -#include <configs/qemu_arm64_defconfig> +#include <configs/qemu-arm64_defconfig> CONFIG_ARM=y CONFIG_ARCH_QEMU=y diff --git a/configs/qemu_arm_defconfig b/configs/qemu-arm_defconfig similarity index 100% rename from configs/qemu_arm_defconfig rename to configs/qemu-arm_defconfig diff --git a/doc/board/emulation/qemu-arm.rst b/doc/board/emulation/qemu-arm.rst index 1c91c7f3ac6..8c2fe8cccf3 100644 --- a/doc/board/emulation/qemu-arm.rst +++ b/doc/board/emulation/qemu-arm.rst @@ -30,12 +30,12 @@ Set the CROSS_COMPILE environment variable as usual, and run: - For ARM:: - make qemu_arm_defconfig + make qemu-arm_defconfig make - For AArch64:: - make qemu_arm64_defconfig + make qemu-arm64_defconfig make Running U-Boot @@ -102,7 +102,7 @@ Booting distros --------------- It is possible to install and boot a standard Linux distribution using -qemu_arm64 by setting up a root disk:: +qemu-arm64 by setting up a root disk:: qemu-img create root.img 20G diff --git a/doc/develop/driver-model/virtio.rst b/doc/develop/driver-model/virtio.rst index 9a5e3240c3c..8750228693b 100644 --- a/doc/develop/driver-model/virtio.rst +++ b/doc/develop/driver-model/virtio.rst @@ -32,8 +32,8 @@ network and block device, the most two commonly used devices, are supported. The following QEMU targets are supported. - - qemu_arm_defconfig - - qemu_arm64_defconfig + - qemu-arm_defconfig + - qemu-arm64_defconfig - qemu-arm-sbsa_defconfig - qemu-riscv32_defconfig - qemu-riscv64_defconfig @@ -51,7 +51,7 @@ variable being properly set to a working toolchain for ARM: .. code-block:: bash - $ make qemu_arm_defconfig + $ make qemu-arm_defconfig $ make You can even create a QEMU ARM target with VirtIO devices showing up on both diff --git a/doc/develop/uefi/uefi.rst b/doc/develop/uefi/uefi.rst index 3ca22b572a9..4505fa588ba 100644 --- a/doc/develop/uefi/uefi.rst +++ b/doc/develop/uefi/uefi.rst @@ -713,7 +713,7 @@ HTTP(s) Boot can be activated by specifying:: For QEMU targets there's a Kconfig that supports this by default:: - make qemu_arm64_lwip_defconfig + make qemu-arm64_lwip_defconfig The commands and functionality are similar to the legacy stack, with the notable exception of not having to define an "httpserverip" if you are trying to resolve diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index d2384219c06..fca9fcb66c6 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -228,7 +228,7 @@ RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \ make -j$(nproc) all install && \ rm -rf /tmp/qemu -# Build OP-TEE for qemu_arm64 +# Build OP-TEE for qemu-arm64 RUN git clone --depth=1 https://github.com/OP-TEE/optee_os.git /tmp/optee_os \ -b 4.7.0 && \ cd /tmp/optee_os/ && \ @@ -241,7 +241,7 @@ RUN git clone --depth=1 https://github.com/OP-TEE/optee_os.git /tmp/optee_os \ CFG_REE_FS=n CFG_CORE_ARM64_PA_BITS=48 \ CFG_TEE_CORE_LOG_LEVEL=2 -# Build fiptool, bl1 and fip for fvp and qemu_arm64 +# Build fiptool, bl1 and fip for fvp and qemu-arm64 RUN git clone --depth=1 -b mbedtls-3.6 https://github.com/ARMmbed/mbedtls.git /tmp/mbedtls RUN git clone --depth=1 https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git /tmp/tf-a \ -b v2.13.0 && \ -- 2.34.1
