From 3cc3f7de06dcf9614554d63b159f0cd6710b96b0 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 18 Jun 2019 12:08:57 +0100 Subject: [PATCH 2/2] use Fedora specific EFI path/name Signed-off-by: Peter Robinson --- 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 f4b3b62fca..2dc8be9815 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) @@ -130,7 +130,7 @@ "bootefi bootmgr ${fdtcontroladdr};" \ "fi;" \ "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 " \ @@ -165,9 +165,9 @@ "run boot_efi_binary\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.21.0