51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
From d8fcb72d566b0ebca1613555ac13c0798817487e Mon Sep 17 00:00:00 2001
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
|
Date: Tue, 24 Nov 2020 10:37:28 +0000
|
|
Subject: [PATCH 2/2] use Fedora specific EFI path/name
|
|
|
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
---
|
|
include/config_distro_bootcmd.h | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
|
index 769477cd80e..22ce3685758 100644
|
|
--- a/include/config_distro_bootcmd.h
|
|
+++ b/include/config_distro_bootcmd.h
|
|
@@ -92,9 +92,9 @@
|
|
|
|
#ifdef CONFIG_EFI_LOADER
|
|
#if defined(CONFIG_ARM64)
|
|
-#define BOOTEFI_NAME "bootaa64.efi"
|
|
+#define BOOTEFI_NAME "grubaa64.efi"
|
|
#elif defined(CONFIG_ARM)
|
|
-#define BOOTEFI_NAME "bootarm.efi"
|
|
+#define BOOTEFI_NAME "grubarm.efi"
|
|
#elif defined(CONFIG_X86_RUN_32BIT)
|
|
#define BOOTEFI_NAME "bootia32.efi"
|
|
#elif defined(CONFIG_X86_RUN_64BIT)
|
|
@@ -132,7 +132,7 @@
|
|
\
|
|
"boot_efi_binary=" \
|
|
"load ${devtype} ${devnum}:${distro_bootpart} " \
|
|
- "${kernel_addr_r} efi/boot/"BOOTEFI_NAME"; " \
|
|
+ "${kernel_addr_r} efi/fedora/"BOOTEFI_NAME"; " \
|
|
"if fdt addr ${fdt_addr_r}; then " \
|
|
"bootefi ${kernel_addr_r} ${fdt_addr_r};" \
|
|
"else " \
|
|
@@ -169,9 +169,9 @@
|
|
"run boot_efi_bootmgr\0" \
|
|
"scan_dev_for_efi=" \
|
|
"if test -e ${devtype} ${devnum}:${distro_bootpart} " \
|
|
- "efi/boot/"BOOTEFI_NAME"; then " \
|
|
+ "efi/fedora/"BOOTEFI_NAME"; then " \
|
|
"echo Found EFI removable media binary " \
|
|
- "efi/boot/"BOOTEFI_NAME"; " \
|
|
+ "efi/fedora/"BOOTEFI_NAME"; " \
|
|
"run scan_dev_for_dtb; " \
|
|
"echo EFI LOAD FAILED: continuing...; " \
|
|
"fi; " \
|
|
--
|
|
2.29.2
|
|
|