diff mbox series

[Concept,15/15] scripts: build-efi: Add RISC-V architecture support

Message ID 20260212001410.1919749-16-sjg@u-boot.org
State New
Headers
Series riscv: Add EFI-application support |

Commit Message

Simon Glass Feb. 12, 2026, 12:14 a.m. UTC 
  From: Simon Glass <simon.glass@canonical.com>

Add RISC-V as a supported architecture for the build-efi script. This
configures QEMU with the riscv-virt machine, EDK2 firmware (RISCV_VIRT
pflash images) and a virtio disk.

The RISCV_VIRT_VARS.fd file is copied from the system directory on
first use since QEMU needs it to be writable.

Co-developed-by: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Simon Glass <simon.glass@canonical.com>
---

 scripts/build-efi       | 25 +++++++++++++++++++++++--
 scripts/build_helper.py |  7 +++++--
 2 files changed, 28 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/scripts/build-efi b/scripts/build-efi
index e23d81bd9b1..a6c8614562b 100755
--- a/scripts/build-efi
+++ b/scripts/build-efi
@@ -101,6 +101,22 @@  class BuildEfi:
                 ]
             extra += ['-drive',
                       f'if=virtio,file={self.img},format=raw,id=hd0']
+        elif self.args.arch == 'riscv':
+            qemu_arch = 'riscv64'
+            extra += ['--machine', 'virt']
+            bios = os.path.join(efi_dir, 'RISCV_VIRT_CODE.fd')
+            if not os.path.exists(bios):
+                bios = '/usr/share/qemu-efi-riscv64/RISCV_VIRT_CODE.fd'
+            var_store = os.path.join(efi_dir, 'RISCV_VIRT_VARS.fd')
+            if not os.path.exists(var_store):
+                sys_var = '/usr/share/qemu-efi-riscv64/RISCV_VIRT_VARS.fd'
+                shutil.copy(sys_var, var_store)
+            extra += [
+                '-drive', f'if=pflash,format=raw,file={bios},readonly=on',
+                '-drive', f'if=pflash,format=raw,file={var_store}'
+                ]
+            extra += ['-drive',
+                      f'if=virtio,file={self.img},format=raw,id=hd0']
         else:  # x86
             if self.helper.bitness == 64:
                 qemu_arch = 'x86_64'
@@ -122,7 +138,7 @@  class BuildEfi:
             extra += ['-display', 'none', '-serial', 'mon:stdio']
             serial_msg = ' (Ctrl-a x to quit)'
         else:
-            if self.args.arch == 'arm':
+            if self.args.arch in ('arm', 'riscv'):
                 extra += ['-device', 'virtio-gpu-pci']
                 extra += ['-device', 'qemu-xhci', '-device', 'usb-kbd',
                           '-device', 'usb-tablet']
@@ -239,7 +255,12 @@  class BuildEfi:
     def start(self):
         """This does all the work"""
         args = self.args
-        arch = 'arm' if self.args.arch == 'arm' else 'x86'
+        if self.args.arch == 'arm':
+            arch = 'arm'
+        elif self.args.arch == 'riscv':
+            arch = 'riscv'
+        else:
+            arch = 'x86'
         build_type = 'payload' if args.payload else 'app'
         build = f'efi-{arch}_{build_type}{self.helper.bitness}'
 
diff --git a/scripts/build_helper.py b/scripts/build_helper.py
index d3e951fc220..bb55daaf84b 100644
--- a/scripts/build_helper.py
+++ b/scripts/build_helper.py
@@ -45,6 +45,8 @@  class Helper:
                 self.os_arch = 'arm64'
             else:
                 self.os_arch = 'arm'
+        elif self.args.arch == 'riscv':
+            self.os_arch = 'riscv64'
         else:  # x86
             if self.bitness == 64:
                 self.os_arch = 'amd64'
@@ -288,8 +290,9 @@  def add_common_args(parser):
     Args:
         parser (argparse.ArgumentParser): Parser to modify
     """
-    parser.add_argument('-a', '--arch', default='arm', choices=['arm', 'x86'],
-                        help='Select architecture (arm, x86) Default: arm')
+    parser.add_argument('-a', '--arch', default='arm',
+                        choices=['arm', 'riscv', 'x86'],
+                        help='Select architecture (arm, riscv, x86) Default: arm')
     parser.add_argument('-b', '--bootcmd', type=str,
                         help='U-Boot bootcmd to pass via fw_cfg')
     parser.add_argument('-B', '--no-build', action='store_true',