'riscv' => 'riscv64', for consistency with the other architectures which all have '64' in the name.
Signed-off-by: Gerd Hoffmann <[email protected]> --- tests/qtest/bios-tables-test.c | 12 ++++++------ pc-bios/descriptors/60-edk2-riscv64.json | 4 ++-- ...2-riscv-code.fd.bz2 => edk2-riscv64-code.fd.bz2} | Bin ...2-riscv-vars.fd.bz2 => edk2-riscv64-vars.fd.bz2} | Bin pc-bios/meson.build | 4 ++-- roms/edk2-build.config | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) rename pc-bios/{edk2-riscv-code.fd.bz2 => edk2-riscv64-code.fd.bz2} (100%) rename pc-bios/{edk2-riscv-vars.fd.bz2 => edk2-riscv64-vars.fd.bz2} (100%) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index e65db5e7fce7..c50fb166fb7c 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1761,8 +1761,8 @@ static void test_acpi_riscv64_virt_tcg_numamem(void) .machine = "virt", .arch = "riscv64", .tcg_only = true, - .uefi_fl1 = "pc-bios/edk2-riscv-code.fd", - .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd", + .uefi_fl1 = "pc-bios/edk2-riscv64-code.fd", + .uefi_fl2 = "pc-bios/edk2-riscv64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2", .ram_start = 0x80000000ULL, .scan_len = 128ULL * MiB, @@ -1862,8 +1862,8 @@ static void test_acpi_riscv64_virt_tcg_acpi_spcr(void) .machine = "virt", .arch = "riscv64", .tcg_only = true, - .uefi_fl1 = "pc-bios/edk2-riscv-code.fd", - .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd", + .uefi_fl1 = "pc-bios/edk2-riscv64-code.fd", + .uefi_fl2 = "pc-bios/edk2-riscv64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2", .ram_start = 0x80000000ULL, .scan_len = 128ULL * 1024 * 1024, @@ -2177,8 +2177,8 @@ static void test_acpi_riscv64_virt_tcg(void) .machine = "virt", .arch = "riscv64", .tcg_only = true, - .uefi_fl1 = "pc-bios/edk2-riscv-code.fd", - .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd", + .uefi_fl1 = "pc-bios/edk2-riscv64-code.fd", + .uefi_fl2 = "pc-bios/edk2-riscv64-vars.fd", .cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2", .ram_start = 0x80000000ULL, .scan_len = 128ULL * MiB, diff --git a/pc-bios/descriptors/60-edk2-riscv64.json b/pc-bios/descriptors/60-edk2-riscv64.json index 14811ca307f6..7f03083d5e0b 100644 --- a/pc-bios/descriptors/60-edk2-riscv64.json +++ b/pc-bios/descriptors/60-edk2-riscv64.json @@ -6,11 +6,11 @@ "mapping": { "device": "flash", "executable": { - "filename": "@DATADIR@/edk2-riscv-code.fd", + "filename": "@DATADIR@/edk2-riscv64-code.fd", "format": "raw" }, "nvram-template": { - "filename": "@DATADIR@/edk2-riscv-vars.fd", + "filename": "@DATADIR@/edk2-riscv64-vars.fd", "format": "raw" } }, diff --git a/pc-bios/edk2-riscv-code.fd.bz2 b/pc-bios/edk2-riscv64-code.fd.bz2 similarity index 100% rename from pc-bios/edk2-riscv-code.fd.bz2 rename to pc-bios/edk2-riscv64-code.fd.bz2 diff --git a/pc-bios/edk2-riscv-vars.fd.bz2 b/pc-bios/edk2-riscv64-vars.fd.bz2 similarity index 100% rename from pc-bios/edk2-riscv-vars.fd.bz2 rename to pc-bios/edk2-riscv64-vars.fd.bz2 diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 7c3d56478345..591f22a50b93 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -3,8 +3,8 @@ if unpack_edk2_blobs fds = [ 'edk2-aarch64-code.fd', 'edk2-aarch64-vars.fd', - 'edk2-riscv-code.fd', - 'edk2-riscv-vars.fd', + 'edk2-riscv64-code.fd', + 'edk2-riscv64-vars.fd', 'edk2-x86_64-code.fd', 'edk2-x86_64-secure-code.fd', 'edk2-loongarch64-code.fd', diff --git a/roms/edk2-build.config b/roms/edk2-build.config index fcf9da8c7681..96ebc3bcd9e7 100644 --- a/roms/edk2-build.config +++ b/roms/edk2-build.config @@ -89,10 +89,10 @@ conf = OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc arch = RISCV64 plat = RiscVVirtQemu dest = ../pc-bios -cpy1 = FV/RISCV_VIRT_CODE.fd edk2-riscv-code.fd -cpy2 = FV/RISCV_VIRT_VARS.fd edk2-riscv-vars.fd -pad1 = edk2-riscv-code.fd 32m -pad2 = edk2-riscv-vars.fd 32m +cpy1 = FV/RISCV_VIRT_CODE.fd edk2-riscv64-code.fd +cpy2 = FV/RISCV_VIRT_VARS.fd edk2-riscv64-vars.fd +pad1 = edk2-riscv64-code.fd 32m +pad2 = edk2-riscv64-vars.fd 32m #################################################################################### # LoongArch64 -- 2.52.0
