- Update shim from 15.8 to 16.1 - Replace separate gnu-efi 4.0.0 tarball with patch-based approach (shim 16.1 bundles gnu-efi from rhboot, apply riscv64 support as patch) - Add 0001-Add-RISC-V-64-support-to-gnu-efi.patch (ncroxon/gnu-efi 4.0.0 riscv64 files adapted for rhboot/gnu-efi shim-16.1) - Add 0008-Fix-additional-signedness-warnings-for-riscv64.patch - Remove 0001-Adopt-modern-ReallocatePool-ABI.patch (not needed with rhboot's gnu-efi) - Rebase all patches for 16.1 - Update SBAT, commit ID, and source checksums
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From a5ff7fbc294af8165a64d803ef45827d89a93d2d Mon Sep 17 00:00:00 2001
|
|
From: Brian 'redbeard' Harrington <redbeard@dead-city.org>
|
|
Date: Tue, 26 Mar 2024 17:13:50 -0700
|
|
Subject: [PATCH] bug: Remove extraneous configuration from RISC-V
|
|
|
|
@davidlt and @xypron pointed out prior changed to binutils 2.42 which
|
|
added support for RISC-V EFI objects. This reflects the upstream
|
|
preference to avoid adding additional architectures which are emitting
|
|
flat binary files via `objcopy` (i.e. `-O binary` architectures).
|
|
|
|
(cherry picked from commit 9f9813bcd29bf196cd2e92c0d05947fafaf32efe)
|
|
---
|
|
Make.defaults | 4 ----
|
|
1 file changed, 4 deletions(-)
|
|
|
|
diff --git a/Make.defaults b/Make.defaults
|
|
index a73d84d..f0ae985 100644
|
|
--- a/Make.defaults
|
|
+++ b/Make.defaults
|
|
@@ -101,10 +101,6 @@ ifeq ($(ARCH),riscv64)
|
|
ARCH_GNUEFI ?= riscv64
|
|
ARCH_SUFFIX ?= riscv64
|
|
ARCH_SUFFIX_UPPER ?= RISCV64
|
|
- FORMAT := -O binary
|
|
- SUBSYSTEM := 0xa
|
|
- ARCH_LDFLAGS += --defsym=EFI_SUBSYSTEM=$(SUBSYSTEM)
|
|
- TIMESTAMP_LOCATION := 72
|
|
endif
|
|
|
|
DEFINES = -DDEFAULT_LOADER='L"$(DEFAULT_LOADER)"' \
|
|
--
|
|
2.43.7
|
|
|