gentoo auto-resync : 12:03:2025 - 01:49:51HEADmaster

3 files changed, 98 insertions, 0 deletions

diff --git a/sys-firmware/edk2/files/descriptors/50-edk2-loongarch64-qcow2-nosb.json b/sys-firmware/edk2/files/descriptors/50-edk2-loongarch64-qcow2-nosb.json
new file mode 100644
index 000000000000..54c07649b6a1
--- /dev/null
+++ b/sys-firmware/edk2/files/descriptors/50-edk2-loongarch64-qcow2-nosb.json
@@ -0,0 +1,33 @@
+{
+    "description": "UEFI for LoongArch VMs",
+    "interface-types": [
+        "uefi"
+    ],
+    "mapping": {
+        "device": "flash",
+        "mode" : "split",
+        "executable": {
+            "filename": "/usr/share/edk2/LoongArchVirtQemu/QEMU_EFI.fd",
+            "format": "raw"
+        },
+        "nvram-template": {
+            "filename": "/usr/share/edk2/LoongArchVirtQemu/QEMU_VARS.fd",
+            "format": "raw"
+        }
+    },
+    "targets": [
+        {
+            "architecture": "loongarch64",
+            "machines": [
+                "virt",
+                "virt-*"
+            ]
+        }
+    ],
+    "features": [
+
+    ],
+    "tags": [
+
+    ]
+}
diff --git a/sys-firmware/edk2/files/edk2-202411-gcc15.patch b/sys-firmware/edk2/files/edk2-202411-gcc15.patch
new file mode 100644
index 000000000000..c2d424240b0a
--- /dev/null
+++ b/sys-firmware/edk2/files/edk2-202411-gcc15.patch
@@ -0,0 +1,32 @@
+https://github.com/tianocore/edk2/commit/e063f8b8a53861043b9872cc35b08a3dc03b0942
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Mon, 20 Jan 2025 09:40:31 +0100
+Subject: [PATCH] BaseTools/Pccts: set C standard
+
+The prehistoric code base doesn't build with ISO C23.  Set the C
+standard to C11 (for both clang and gcc) so it continues to build with
+gcc 15 (which uses C23 by default).
+
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
++++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
+@@ -169,7 +169,7 @@ ANTLR=${BIN_DIR}/antlr
+ DLG=${BIN_DIR}/dlg

+ OBJ_EXT=o

+ OUT_OBJ = -o

+-CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536

++CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536 -std=gnu11

+ CPPFLAGS=

+ #

+ # SGI Users, use this CFLAGS

+--- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
++++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
+@@ -123,7 +123,7 @@ endif
+ COPT=-O

+ ANTLR=${BIN_DIR}/antlr

+ DLG=${BIN_DIR}/dlg

+-CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536

++CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536 -std=gnu11

+ CPPFLAGS=

+ OBJ_EXT=o

+ OUT_OBJ = -o

diff --git a/sys-firmware/edk2/files/edk2-202411-loong.patch b/sys-firmware/edk2/files/edk2-202411-loong.patch
new file mode 100644
index 000000000000..f2df0376b730
--- /dev/null
+++ b/sys-firmware/edk2/files/edk2-202411-loong.patch
@@ -0,0 +1,33 @@
+https://github.com/tianocore/edk2/commit/b8f3199595d23c29433528a5207a6aa9fb368d44
+From: Chao Li <lichao@loongson.cn>
+Date: Tue, 17 Dec 2024 18:05:45 +0800
+Subject: [PATCH] OvmfPkg/LoongArch: Enabling some base libraries
+
+BaseCryptLib, RngLib, IntrinsicLib and OpensslLib are enabled by default
+on LoongArch VM, since some APPs or OS require them.
+
+Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
+Cc: Jiewen Yao <jiewen.yao@intel.com>
+Cc: Gerd Hoffmann <kraxel@redhat.com>
+Signed-off-by: Chao Li <lichao@loongson.cn>
+--- a/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc
++++ b/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc
+@@ -156,6 +156,18 @@
+   FileExplorerLib                  | MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

+   ImagePropertiesRecordLib         | MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf

+ 

++  #

++  # CryptoPkg libraries needed by multiple firmware features

++  #

++  IntrinsicLib                     | CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

++!if $(NETWORK_TLS_ENABLE) == TRUE

++  OpensslLib                       | CryptoPkg/Library/OpensslLib/OpensslLib.inf

++!else

++  OpensslLib                       | CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf

++!endif

++  BaseCryptLib                     | CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

++  RngLib                           | MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf

++

+ !if $(HTTP_BOOT_ENABLE) == TRUE

+   HttpLib                          | MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf

+ !endif