2021-02-10 11:05:10 +00:00
|
|
|
From 308c4ac71c439b483bd69ed9e387cc1a56566af9 Mon Sep 17 00:00:00 2001
|
2017-04-25 13:55:41 +00:00
|
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
2021-02-10 11:05:10 +00:00
|
|
|
Date: Mon, 8 Feb 2021 10:11:39 +0000
|
|
|
|
Subject: [PATCH] use Fedora specific EFI path/name
|
2017-04-25 13:55:41 +00:00
|
|
|
|
|
|
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
|
|
---
|
2019-03-19 10:53:38 +00:00
|
|
|
include/config_distro_bootcmd.h | 10 +++++-----
|
|
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
2017-04-25 13:55:41 +00:00
|
|
|
|
|
|
|
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
2021-02-10 11:05:10 +00:00
|
|
|
index 3d186b6d20..eda57e1707 100644
|
2017-04-25 13:55:41 +00:00
|
|
|
--- a/include/config_distro_bootcmd.h
|
|
|
|
+++ b/include/config_distro_bootcmd.h
|
2019-03-19 10:53:38 +00:00
|
|
|
@@ -92,9 +92,9 @@
|
2017-04-25 13:55:41 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_EFI_LOADER
|
|
|
|
#if defined(CONFIG_ARM64)
|
|
|
|
-#define BOOTEFI_NAME "bootaa64.efi"
|
|
|
|
+#define BOOTEFI_NAME "grubaa64.efi"
|
|
|
|
#elif defined(CONFIG_ARM)
|
2019-03-19 10:53:38 +00:00
|
|
|
-#define BOOTEFI_NAME "bootarm.efi"
|
|
|
|
+#define BOOTEFI_NAME "grubarm.efi"
|
2017-12-22 01:35:59 +00:00
|
|
|
#elif defined(CONFIG_X86_RUN_32BIT)
|
2019-03-19 10:53:38 +00:00
|
|
|
#define BOOTEFI_NAME "bootia32.efi"
|
|
|
|
#elif defined(CONFIG_X86_RUN_64BIT)
|
2021-02-10 11:05:10 +00:00
|
|
|
@@ -140,7 +140,7 @@
|
2020-11-24 10:43:24 +00:00
|
|
|
\
|
|
|
|
"boot_efi_binary=" \
|
2017-04-25 13:55:41 +00:00
|
|
|
"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};" \
|
2018-02-07 12:41:43 +00:00
|
|
|
"else " \
|
2021-02-10 11:05:10 +00:00
|
|
|
@@ -177,9 +177,9 @@
|
|
|
|
"run boot_efi_binary\0" \
|
2019-06-18 11:12:09 +00:00
|
|
|
"scan_dev_for_efi=" \
|
2017-07-12 07:45:51 +00:00
|
|
|
"if test -e ${devtype} ${devnum}:${distro_bootpart} " \
|
|
|
|
- "efi/boot/"BOOTEFI_NAME"; then " \
|
2020-11-24 10:43:24 +00:00
|
|
|
+ "efi/fedora/"BOOTEFI_NAME"; then " \
|
2017-07-12 07:45:51 +00:00
|
|
|
"echo Found EFI removable media binary " \
|
|
|
|
- "efi/boot/"BOOTEFI_NAME"; " \
|
2020-11-24 10:43:24 +00:00
|
|
|
+ "efi/fedora/"BOOTEFI_NAME"; " \
|
2019-06-18 11:12:09 +00:00
|
|
|
"run scan_dev_for_dtb; " \
|
2017-07-12 07:45:51 +00:00
|
|
|
"echo EFI LOAD FAILED: continuing...; " \
|
|
|
|
"fi; " \
|
2017-04-25 13:55:41 +00:00
|
|
|
--
|
2020-12-14 08:41:34 +00:00
|
|
|
2.29.2
|
2017-04-25 13:55:41 +00:00
|
|
|
|