|
 |
82aabc8 |
From 308c4ac71c439b483bd69ed9e387cc1a56566af9 Mon Sep 17 00:00:00 2001
|
|
|
c199aaa |
From: Peter Robinson <pbrobinson@gmail.com>
|
|
|
82aabc8 |
Date: Mon, 8 Feb 2021 10:11:39 +0000
|
|
|
82aabc8 |
Subject: [PATCH] use Fedora specific EFI path/name
|
|
|
c199aaa |
|
|
|
c199aaa |
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
|
c199aaa |
---
|
|
|
982620b |
include/config_distro_bootcmd.h | 10 +++++-----
|
|
|
982620b |
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
c199aaa |
|
|
|
c199aaa |
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
|
|
82aabc8 |
index 3d186b6d20..eda57e1707 100644
|
|
|
c199aaa |
--- a/include/config_distro_bootcmd.h
|
|
|
c199aaa |
+++ b/include/config_distro_bootcmd.h
|
|
|
982620b |
@@ -92,9 +92,9 @@
|
|
|
c199aaa |
|
|
|
c199aaa |
#ifdef CONFIG_EFI_LOADER
|
|
|
c199aaa |
#if defined(CONFIG_ARM64)
|
|
|
c199aaa |
-#define BOOTEFI_NAME "bootaa64.efi"
|
|
|
c199aaa |
+#define BOOTEFI_NAME "grubaa64.efi"
|
|
|
c199aaa |
#elif defined(CONFIG_ARM)
|
|
|
982620b |
-#define BOOTEFI_NAME "bootarm.efi"
|
|
|
982620b |
+#define BOOTEFI_NAME "grubarm.efi"
|
|
|
ad36d48 |
#elif defined(CONFIG_X86_RUN_32BIT)
|
|
|
982620b |
#define BOOTEFI_NAME "bootia32.efi"
|
|
|
982620b |
#elif defined(CONFIG_X86_RUN_64BIT)
|
|
|
82aabc8 |
@@ -140,7 +140,7 @@
|
|
|
0d5a9f5 |
\
|
|
|
0d5a9f5 |
"boot_efi_binary=" \
|
|
|
c199aaa |
"load ${devtype} ${devnum}:${distro_bootpart} " \
|
|
|
c199aaa |
- "${kernel_addr_r} efi/boot/"BOOTEFI_NAME"; " \
|
|
|
c199aaa |
+ "${kernel_addr_r} efi/fedora/"BOOTEFI_NAME"; " \
|
|
|
c199aaa |
"if fdt addr ${fdt_addr_r}; then " \
|
|
|
c199aaa |
"bootefi ${kernel_addr_r} ${fdt_addr_r};" \
|
|
|
5b6fc3b |
"else " \
|
|
|
82aabc8 |
@@ -177,9 +177,9 @@
|
|
|
82aabc8 |
"run boot_efi_binary\0" \
|
|
|
c529a6c |
"scan_dev_for_efi=" \
|
|
|
c438fd0 |
"if test -e ${devtype} ${devnum}:${distro_bootpart} " \
|
|
|
c438fd0 |
- "efi/boot/"BOOTEFI_NAME"; then " \
|
|
|
0d5a9f5 |
+ "efi/fedora/"BOOTEFI_NAME"; then " \
|
|
|
c438fd0 |
"echo Found EFI removable media binary " \
|
|
|
c438fd0 |
- "efi/boot/"BOOTEFI_NAME"; " \
|
|
|
0d5a9f5 |
+ "efi/fedora/"BOOTEFI_NAME"; " \
|
|
|
c529a6c |
"run scan_dev_for_dtb; " \
|
|
|
c438fd0 |
"echo EFI LOAD FAILED: continuing...; " \
|
|
|
c438fd0 |
"fi; " \
|
|
|
c199aaa |
--
|
|
 |
5fa2e92 |
2.29.2
|
|
|
c199aaa |
|