The QEMU ARM SBSA virtual platform is 64-bit, so rename its defconfig to include 'arm64' for clarity.
Signed-off-by: Bin Meng <[email protected]> --- Changes in v2: - Add missing azure and gitlab ci changes .azure-pipelines.yml | 6 +++--- .gitlab-ci.yml | 6 +++--- board/emulation/qemu-arm/MAINTAINERS | 2 +- .../{qemu-arm-sbsa_defconfig => qemu-arm64-sbsa_defconfig} | 0 doc/develop/driver-model/virtio.rst | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename configs/{qemu-arm-sbsa_defconfig => qemu-arm64-sbsa_defconfig} (100%) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 1009938f332..9216df16f70 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -268,7 +268,7 @@ stages: wget -O - https://github.com/riscv-software-src/opensbi/releases/download/v1.3.1/opensbi-1.3.1-rv-bin.tar.xz | tar -C /tmp -xJ; export OPENSBI=/tmp/opensbi-1.3.1-rv-bin/share/opensbi/lp64/generic/firmware/fw_dynamic.bin; fi - if [[ "\${TEST_PY_BD}" == "qemu-arm-sbsa" ]]; then + if [[ "\${TEST_PY_BD}" == "qemu-arm64-sbsa" ]]; then wget -O /tmp/bl1.bin https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/latest/tf-a/bl1.bin; wget -O /tmp/fip.bin https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/latest/tf-a/fip.bin; export BINMAN_INDIRS=/tmp @@ -483,8 +483,8 @@ stages: TEST_PY_BD: "qemu-arm64" TEST_PY_ID: "--id fw_handoff_tfa_optee" TEST_PY_TEST_SPEC: "test_fw_handoff" - qemu-arm_sbsa_ref: - TEST_PY_BD: "qemu-arm-sbsa" + qemu-arm64-sbsa_ref: + TEST_PY_BD: "qemu-arm64-sbsa" TEST_PY_TEST_SPEC: "not sleep" qemu_m68k: TEST_PY_BD: "M5208EVBE" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f91780c764..19ab1ad53a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ stages: wget -O - https://github.com/riscv-software-src/opensbi/releases/download/v1.3.1/opensbi-1.3.1-rv-bin.tar.xz | tar -C /tmp -xJ; export OPENSBI=/tmp/opensbi-1.3.1-rv-bin/share/opensbi/lp64/generic/firmware/fw_dynamic.bin; fi - - if [[ "${TEST_PY_BD}" == "qemu-arm-sbsa" ]]; then + - if [[ "${TEST_PY_BD}" == "qemu-arm64-sbsa" ]]; then wget -O /tmp/bl1.bin https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/latest/tf-a/bl1.bin; wget -O /tmp/fip.bin https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/latest/tf-a/fip.bin; export BINMAN_INDIRS=/tmp; @@ -402,9 +402,9 @@ qemu-arm64_tfa_fw_handoff test.py: TEST_PY_TEST_SPEC: "test_fw_handoff" <<: *buildman_and_testpy_dfn -qemu-arm_sbsa test.py: +qemu-arm64-sbsa test.py: variables: - TEST_PY_BD: "qemu-arm-sbsa" + TEST_PY_BD: "qemu-arm64-sbsa" TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn diff --git a/board/emulation/qemu-arm/MAINTAINERS b/board/emulation/qemu-arm/MAINTAINERS index b2b1fce75cf..fea9e97f868 100644 --- a/board/emulation/qemu-arm/MAINTAINERS +++ b/board/emulation/qemu-arm/MAINTAINERS @@ -6,4 +6,4 @@ F: board/emulation/common/ F: include/configs/qemu-arm.h F: include/configs/qemu-sbsa.h F: configs/qemu-arm* -F: configs/qemu-arm-sbsa_defconfig +F: configs/qemu-arm64-sbsa_defconfig diff --git a/configs/qemu-arm-sbsa_defconfig b/configs/qemu-arm64-sbsa_defconfig similarity index 100% rename from configs/qemu-arm-sbsa_defconfig rename to configs/qemu-arm64-sbsa_defconfig diff --git a/doc/develop/driver-model/virtio.rst b/doc/develop/driver-model/virtio.rst index 8750228693b..df07a0658b2 100644 --- a/doc/develop/driver-model/virtio.rst +++ b/doc/develop/driver-model/virtio.rst @@ -34,7 +34,7 @@ The following QEMU targets are supported. - qemu-arm_defconfig - qemu-arm64_defconfig - - qemu-arm-sbsa_defconfig + - qemu-arm64-sbsa_defconfig - qemu-riscv32_defconfig - qemu-riscv64_defconfig - qemu-x86_defconfig -- 2.34.1
