edk2: rename risc-v firmware builds
'riscv' => 'riscv64', for consistency with the other architectures which all have '64' in the name. Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-ID: <20260824164751.1700783-7-kraxel@redhat.com>
Gerd Hoffmann committed
Aug 24, 2026 at 18:47 UTC
2e0eeac953bcf613c07a775375dabd8971b5de74
6 files changed
+14
-14
pc-bios/descriptors/60-edk2-riscv64.json
+2
-2
@@ -6,11 +6,11 @@
6
"mapping": {
7
"device": "flash",
8
"executable": {
9
- "filename": "@DATADIR@/edk2-riscv-code.fd",
9
+ "filename": "@DATADIR@/edk2-riscv64-code.fd",
10
"format": "raw"
11
},
12
"nvram-template": {
13
- "filename": "@DATADIR@/edk2-riscv-vars.fd",
13
+ "filename": "@DATADIR@/edk2-riscv64-vars.fd",
14
"format": "raw"
15
}
16
},
pc-bios/edk2-riscv64-code.fd.bz2
renamed
pc-bios/edk2-riscv64-vars.fd.bz2
renamed
pc-bios/meson.build
+2
-2
@@ -3,8 +3,8 @@ if unpack_edk2_blobs
3
fds = [
4
'edk2-aarch64-code.fd',
5
'edk2-aarch64-vars.fd',
6
- 'edk2-riscv-code.fd',
7
- 'edk2-riscv-vars.fd',
6
+ 'edk2-riscv64-code.fd',
7
+ 'edk2-riscv64-vars.fd',
8
'edk2-x86_64-code.fd',
9
'edk2-x86_64-secure-code.fd',
10
'edk2-loongarch64-code.fd',
roms/edk2-build.config
+4
-4
@@ -89,10 +89,10 @@ conf = OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc
89
arch = RISCV64
90
plat = RiscVVirtQemu
91
dest = ../pc-bios
92
-cpy1 = FV/RISCV_VIRT_CODE.fd edk2-riscv-code.fd
93
-cpy2 = FV/RISCV_VIRT_VARS.fd edk2-riscv-vars.fd
94
-pad1 = edk2-riscv-code.fd 32m
95
-pad2 = edk2-riscv-vars.fd 32m
92
+cpy1 = FV/RISCV_VIRT_CODE.fd edk2-riscv64-code.fd
93
+cpy2 = FV/RISCV_VIRT_VARS.fd edk2-riscv64-vars.fd
94
+pad1 = edk2-riscv64-code.fd 32m
95
+pad2 = edk2-riscv64-vars.fd 32m
96
97
####################################################################################
98
# LoongArch64
tests/qtest/bios-tables-test.c
+6
-6
@@ -1782,8 +1782,8 @@ static void test_acpi_riscv64_virt_tcg_numamem(void)
1782
.machine = "virt",
1783
.arch = "riscv64",
1784
.tcg_only = true,
1785
- .uefi_fl1 = "pc-bios/edk2-riscv-code.fd",
1786
- .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd",
1785
+ .uefi_fl1 = "pc-bios/edk2-riscv64-code.fd",
1786
+ .uefi_fl2 = "pc-bios/edk2-riscv64-vars.fd",
1787
.cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2",
1788
.ram_start = 0x80000000ULL,
1789
.scan_len = 128ULL * MiB,
@@ -1883,8 +1883,8 @@ static void test_acpi_riscv64_virt_tcg_acpi_spcr(void)
1883
.machine = "virt",
1884
.arch = "riscv64",
1885
.tcg_only = true,
1886
- .uefi_fl1 = "pc-bios/edk2-riscv-code.fd",
1887
- .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd",
1886
+ .uefi_fl1 = "pc-bios/edk2-riscv64-code.fd",
1887
+ .uefi_fl2 = "pc-bios/edk2-riscv64-vars.fd",
1888
.cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2",
1889
.ram_start = 0x80000000ULL,
1890
.scan_len = 128ULL * 1024 * 1024,
@@ -2198,8 +2198,8 @@ static void test_acpi_riscv64_virt_tcg(void)
2198
.machine = "virt",
2199
.arch = "riscv64",
2200
.tcg_only = true,
2201
- .uefi_fl1 = "pc-bios/edk2-riscv-code.fd",
2202
- .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd",
2201
+ .uefi_fl1 = "pc-bios/edk2-riscv64-code.fd",
2202
+ .uefi_fl2 = "pc-bios/edk2-riscv64-vars.fd",
2203
.cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2",
2204
.ram_start = 0x80000000ULL,
2205
.scan_len = 128ULL * MiB,