From: Bin Meng <[email protected]> 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]> Reviewed-by: Simon Glass <[email protected]> Signed-off-by: Bin Meng <[email protected]> --- Changes in v3: - Rebase on current mainline and keep the removed ARM devicetree deleted Changes in v2: - Add missing Azure and GitLab CI changes .azure-pipelines.yml | 24 +++++++++---------- .gitlab-ci.yml | 24 +++++++++---------- MAINTAINERS | 2 +- arch/arm/dts/qemu-arm64.dts | 2 +- board/emulation/qemu-arm/MAINTAINERS | 2 +- ...pi_defconfig => qemu-arm64_acpi_defconfig} | 2 +- ...u_arm64_defconfig => qemu-arm64_defconfig} | 0 ...ip_defconfig => qemu-arm64_lwip_defconfig} | 2 +- ...{qemu_arm_defconfig => qemu-arm_defconfig} | 0 doc/board/emulation/qemu-arm.rst | 8 +++---- doc/develop/driver-model/virtio.rst | 6 ++--- doc/develop/uefi/uefi.rst | 2 +- tools/docker/Dockerfile | 8 +++---- 13 files changed, 41 insertions(+), 41 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} (83%) rename configs/{qemu_arm_defconfig => qemu-arm_defconfig} (100%) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 556828f42fe..071fcae104f 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -253,9 +253,9 @@ stages: cd \${WORK_DIR} git config --global --add safe.directory \${WORK_DIR} git clone --depth=1 https://git.u-boot-project.org/u-boot/u-boot-test-hooks /tmp/uboot-test-hooks - # qemu_arm64_lwip_defconfig is the same as qemu_arm64 but with NET_LWIP enabled. - # The test config and the boardenv file from qemu_arm64 can be re-used so create symlinks - ln -s conf.qemu_arm64 /tmp/uboot-test-hooks/bin/travis-ci/conf.qemu_arm64_lwip_na + # qemu-arm64_lwip_defconfig is the same as qemu-arm64 but with NET_LWIP enabled + # The test config and the boardenv file from qemu-arm64 can be re-used so create symlinks + ln -s conf.qemu-arm64 /tmp/uboot-test-hooks/bin/travis-ci/conf.qemu-arm64_lwip_na ln -s u_boot_boardenv_qemu_arm64_na.py /tmp/uboot-test-hooks/py/travis-ci/u_boot_boardenv_qemu_arm64_lwip_na.py ln -s travis-ci /tmp/uboot-test-hooks/bin/\`hostname\` ln -s travis-ci /tmp/uboot-test-hooks/py/\`hostname\` @@ -474,21 +474,21 @@ stages: TEST_PY_BD: "integratorcp_cm926ejs" TEST_PY_ID: "--id qemu" TEST_PY_TEST_SPEC: "not sleep" - qemu_arm: - TEST_PY_BD: "qemu_arm" + qemu-arm: + TEST_PY_BD: "qemu-arm" TEST_PY_TEST_SPEC: "not sleep" - qemu_arm64: - TEST_PY_BD: "qemu_arm64" + qemu-arm64: + TEST_PY_BD: "qemu-arm64" TEST_PY_TEST_SPEC: "not sleep" OVERRIDE: "-a CONFIG_SEMIHOSTING=y" - qemu_arm64_lwip: - TEST_PY_BD: "qemu_arm64_lwip" + qemu-arm64_lwip: + TEST_PY_BD: "qemu-arm64_lwip" TEST_PY_TEST_SPEC: "test_net_dhcp or test_net_ping or test_net_tftpboot" - qemu_arm64_tfa_fw_handoff: - TEST_PY_BD: "qemu_arm64" + qemu-arm64_tfa_fw_handoff: + TEST_PY_BD: "qemu-arm64" TEST_PY_ID: "--id fw_handoff_tfa_optee" TEST_PY_TEST_SPEC: "test_fw_handoff" - qemu_arm_sbsa_ref: + qemu-arm_sbsa_ref: TEST_PY_BD: "qemu-arm-sbsa" TEST_PY_TEST_SPEC: "not sleep" qemu_m68k: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0338f20b8a2..905523e3e27 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,9 +37,9 @@ stages: # Clone uboot-test-hooks - git config --global --add safe.directory "${CI_PROJECT_DIR}" - git clone --depth=1 https://git.u-boot-project.org/u-boot/u-boot-test-hooks /tmp/uboot-test-hooks - # qemu_arm64_lwip_defconfig is the same as qemu_arm64 but with NET_LWIP enabled. - # The test config and the boardenv file from qemu_arm64 can be re-used so create symlinks - - ln -s conf.qemu_arm64 /tmp/uboot-test-hooks/bin/travis-ci/conf.qemu_arm64_lwip_na + # qemu-arm64_lwip_defconfig is the same as qemu-arm64 but with NET_LWIP enabled + # The test config and the boardenv file from qemu-arm64 can be re-used so create symlinks + - ln -s conf.qemu-arm64 /tmp/uboot-test-hooks/bin/travis-ci/conf.qemu-arm64_lwip_na - ln -s u_boot_boardenv_qemu_arm64_na.py /tmp/uboot-test-hooks/py/travis-ci/u_boot_boardenv_qemu_arm64_lwip_na.py - ln -s travis-ci /tmp/uboot-test-hooks/bin/`hostname` - ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname` @@ -386,33 +386,33 @@ integratorcp_cm926ejs test.py: TEST_PY_ID: "--id qemu" <<: *buildman_and_testpy_dfn -qemu_arm test.py: +qemu-arm test.py: variables: - TEST_PY_BD: "qemu_arm" + TEST_PY_BD: "qemu-arm" TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn -qemu_arm64 test.py: +qemu-arm64 test.py: variables: - TEST_PY_BD: "qemu_arm64" + TEST_PY_BD: "qemu-arm64" TEST_PY_TEST_SPEC: "not sleep" OVERRIDE: "-a CONFIG_SEMIHOSTING=y" <<: *buildman_and_testpy_dfn -qemu_arm64_lwip test.py: +qemu-arm64_lwip test.py: variables: - TEST_PY_BD: "qemu_arm64_lwip" + TEST_PY_BD: "qemu-arm64_lwip" TEST_PY_TEST_SPEC: "test_net_dhcp or test_net_ping or test_net_tftpboot" <<: *buildman_and_testpy_dfn -qemu_arm64_tfa_fw_handoff test.py: +qemu-arm64_tfa_fw_handoff test.py: variables: - TEST_PY_BD: "qemu_arm64" + TEST_PY_BD: "qemu-arm64" TEST_PY_ID: "--id fw_handoff_tfa_optee" TEST_PY_TEST_SPEC: "test_fw_handoff" <<: *buildman_and_testpy_dfn -qemu_arm_sbsa test.py: +qemu-arm_sbsa test.py: variables: TEST_PY_BD: "qemu-arm-sbsa" TEST_PY_TEST_SPEC: "not sleep" diff --git a/MAINTAINERS b/MAINTAINERS index d273603ac64..96203466579 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1330,7 +1330,7 @@ M: Jerome Forissier <[email protected]> S: Maintained T: git https://git.u-boot-project.org/u-boot/custodians/u-boot-net.git F: cmd/lwip/ -F: configs/qemu_arm64_lwip_defconfig +F: configs/qemu-arm64_lwip_defconfig F: include/net-lwip.h F: lib/lwip/Makefile F: lib/lwip/u-boot/ 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 83% rename from configs/qemu_arm64_lwip_defconfig rename to configs/qemu-arm64_lwip_defconfig index 06ed5a131db..5b1ddb2af03 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 9e993ca9783..d575bc64ff6 100644 --- a/doc/board/emulation/qemu-arm.rst +++ b/doc/board/emulation/qemu-arm.rst @@ -32,7 +32,7 @@ U-Boot - For AArch64:: - make qemu_arm64_defconfig + make qemu-arm64_defconfig make On successful build 'u-boot.bin' should be created. It's necessary in the following @@ -100,12 +100,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 (secure) @@ -182,7 +182,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 e5da9f4301c..90a12fb3003 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 94ddf690440..c2bad4cdd5f 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 187320c26d5..8680ea257e5 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -251,7 +251,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/ && \ @@ -264,7 +264,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 && \ @@ -294,9 +294,9 @@ RUN git clone --depth=1 https://git.trustedfirmware.org/TF-A/trusted-firmware-a. MBOOT_EL_HASH_ALG=sha256 \ MBEDTLS_DIR=/tmp/mbedtls \ -j$(nproc) all fip && \ - mkdir -p /opt/tf-a/qemu_arm64_fw_handoff_tfa_optee && \ + mkdir -p /opt/tf-a/qemu-arm64_fw_handoff_tfa_optee && \ cp build/qemu/release/fip.bin build/qemu/release/bl1.bin \ - /opt/tf-a/qemu_arm64_fw_handoff_tfa_optee/ && \ + /opt/tf-a/qemu-arm64_fw_handoff_tfa_optee/ && \ make CROSS_COMPILE=/opt/gcc-${TCVER}-nolibc/aarch64-linux/bin/aarch64-linux- \ PLAT=sun50i_a64 -j$(nproc) all && \ mkdir -p /opt/tf-a/pine64_plus && \ --- base-commit: c267fa81d42b5a5bd1055d3858f74496faa6082f branch: qemu-arm -- 2.53.0
