From e0caba9cb86a7b241c61dff115bfb7c62b17195e Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Tue, 30 Apr 2024 16:30:40 +0300
Subject: [PATCH] gnu: ovmf-arm: Update to 202402.

* gnu/packages/firmware.scm (ovmf-arm): Update to 202402.  Build using
make-ovmf-firmware.

Change-Id: I1adf1afc9ceb29db373c2e0d05d42a3c68232cb5
---
 gnu/packages/firmware.scm | 52 +++++++++++++--------------------------
 1 file changed, 17 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 99ca2359a5..85fdaf3fba 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -1054,6 +1054,23 @@ (define-public ovmf-aarch64
                                               "RELEASE_GCC/FV/QEMU_EFI.fd")
                                (string-append fmw "/ovmf_aarch64.bin"))))))))))))
 
+(define-public ovmf-arm
+  (let ((base (make-ovmf-firmware "armhf")))
+    (package
+      (inherit base)
+      (name "ovmf-arm")
+      (arguments
+        (substitute-keyword-arguments (package-arguments base)
+          ((#:phases phases)
+           #~(modify-phases #$phases
+               (replace 'install
+                 (lambda _
+                   (let ((fmw (string-append #$output "/share/firmware")))
+                    (mkdir-p fmw)
+                    (copy-file (string-append "Build/ArmVirtQemu-ARM/"
+                                              "RELEASE_GCC/FV/QEMU_EFI.fd")
+                               (string-append fmw "/ovmf_arm.bin"))))))))))))
+
 (define-public ovmf
   (let ((toolchain-ver "GCC5"))
     (package
@@ -1154,41 +1171,6 @@ (define-public ovmf
       (license (list license:expat
                      license:bsd-2 license:bsd-3 license:bsd-4)))))
 
-(define-public ovmf-arm
-  (let ((toolchain-ver "GCC5"))
-    (package
-      (inherit ovmf)
-      (name "ovmf-arm")
-      (native-inputs
-       (append (package-native-inputs ovmf)
-               (if (not (string-prefix? "armhf" (%current-system)))
-                   `(("cross-gcc" ,(cross-gcc "arm-linux-gnueabihf"))
-                     ("cross-binutils" ,(cross-binutils "arm-linux-gnueabihf")))
-                   '())))
-      (arguments
-       (substitute-keyword-arguments (package-arguments ovmf)
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              #$@(if (string-prefix? "armhf" (%current-system))
-                     '()
-                     #~((add-before 'configure 'set-env
-                          (lambda _
-                            (setenv (string-append #$toolchain-ver "_ARM_PREFIX")
-                                    "arm-linux-gnueabihf-")))))
-              (replace 'build
-                (lambda _
-                  (invoke "build" "-a" "ARM" "-t" #$toolchain-ver
-                          "-p" "ArmVirtPkg/ArmVirtQemu.dsc")))
-              (delete 'build-x64)
-              (replace 'install
-                (lambda _
-                  (let ((fmw (string-append #$output "/share/firmware")))
-                    (mkdir-p fmw)
-                    (copy-file (string-append "Build/ArmVirtQemu-ARM/RELEASE_"
-                                              #$toolchain-ver "/FV/QEMU_EFI.fd")
-                               (string-append fmw "/ovmf_arm.bin")))))))))
-      (supported-systems %supported-systems))))
-
 (define-public ovmf-riscv64
   (let ((toolchain-ver "GCC5"))
     (package