[efi] Remove redundant EFI_BOOT_FILE definitions

As of commit 79c0173 ("[build] Create util/genfsimg for building
filesystem-based images"), the EFI boot file name for each CPU
architecture is defined within the genfsimg script itself, rather than
being passed in as a Makefile parameter.

Remove the now-redundant Makefile definitions for EFI_BOOT_FILE.

Reported-by: Christian I. Nilsson <nikize@gmail.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/arch/arm32/Makefile.efi b/src/arch/arm32/Makefile.efi
index d720f34f0e0e667151a5ebfd0258f0ec41e19bc5..9bd34383deb79f7415afbe1d7a8ccfed022cffb9 100644 (file)
--- a/src/arch/arm32/Makefile.efi
+++ b/src/arch/arm32/Makefile.efi
@@ -8,10 +8,6 @@ CFLAGS         += -mfloat-abi=soft
 #
 ELF2EFI                = $(ELF2EFI32)
 
-# Specify EFI boot file
-#
-EFI_BOOT_FILE  = bootarm.efi
-
 # Include generic EFI Makefile
 #
 MAKEDEPS       += arch/arm/Makefile.efi

diff --git a/src/arch/arm64/Makefile.efi b/src/arch/arm64/Makefile.efi
index 998a64d0389ba19d882e7aa291b7ce841fee2b75..96f2953f4256c5e4d9eefe1b9076c89e564414d6 100644 (file)
--- a/src/arch/arm64/Makefile.efi
+++ b/src/arch/arm64/Makefile.efi
@@ -4,10 +4,6 @@
 #
 ELF2EFI                = $(ELF2EFI64)
 
-# Specify EFI boot file
-#
-EFI_BOOT_FILE  = bootaa64.efi
-
 # Include generic EFI Makefile
 #
 MAKEDEPS       += arch/arm/Makefile.efi

diff --git a/src/arch/i386/Makefile.efi b/src/arch/i386/Makefile.efi
index 37ede65ace3cc29215f1cff9b54ed69fab4e8413..aa809eb5df90ebe53dd8e2c51927034520e54087 100644 (file)
--- a/src/arch/i386/Makefile.efi
+++ b/src/arch/i386/Makefile.efi
@@ -8,10 +8,6 @@ ELF2EFI                = $(ELF2EFI32)
 #
 CFLAGS         += -malign-double
 
-# Specify EFI boot file
-#
-EFI_BOOT_FILE  = bootia32.efi
-
 # Include generic EFI Makefile
 #
 MAKEDEPS       += arch/x86/Makefile.efi

diff --git a/src/arch/loong64/Makefile.efi b/src/arch/loong64/Makefile.efi
index 1c51bcd67abb7daa1ea94638f26a62af29fe386e..611c910f23b2c9e8d5fe384ce9f2e4abafff1c78 100644 (file)
--- a/src/arch/loong64/Makefile.efi
+++ b/src/arch/loong64/Makefile.efi
@@ -4,10 +4,6 @@
 #
 ELF2EFI                = $(ELF2EFI64)
 
-# Specify EFI boot file
-#
-EFI_BOOT_FILE  = bootloongarch64.efi
-
 # Include generic EFI Makefile
 #
 MAKEDEPS       += Makefile.efi

diff --git a/src/arch/riscv32/Makefile.efi b/src/arch/riscv32/Makefile.efi
index db83c8c144bc3e2837d196b4432b022117457cb8..2cc1a930f2b9f879761f0ec9ffd5624cc1bc6211 100644 (file)
--- a/src/arch/riscv32/Makefile.efi
+++ b/src/arch/riscv32/Makefile.efi
@@ -4,10 +4,6 @@
 #
 ELF2EFI                = $(ELF2EFI32)
 
-# Specify EFI boot file
-#
-EFI_BOOT_FILE  = bootriscv32.efi
-
 # Include generic EFI Makefile
 #
 MAKEDEPS       += arch/riscv/Makefile.efi

diff --git a/src/arch/riscv64/Makefile.efi b/src/arch/riscv64/Makefile.efi
index b19e036a3d6474715845fba9bd2093e7377ad042..3948ca15c27371e2bd500f724b30e53656ddf90f 100644 (file)
--- a/src/arch/riscv64/Makefile.efi
+++ b/src/arch/riscv64/Makefile.efi
@@ -4,10 +4,6 @@
 #
 ELF2EFI                = $(ELF2EFI64)
 
-# Specify EFI boot file
-#
-EFI_BOOT_FILE  = bootriscv64.efi
-
 # Include generic EFI Makefile
 #
 MAKEDEPS       += arch/riscv/Makefile.efi

diff --git a/src/arch/x86_64/Makefile.efi b/src/arch/x86_64/Makefile.efi
index 0041bb8f0de34b40f8a2660a84298969adf031bd..f38375607b74de9831f6b70ce565cd790600ecc8 100644 (file)
--- a/src/arch/x86_64/Makefile.efi
+++ b/src/arch/x86_64/Makefile.efi
@@ -12,10 +12,6 @@ CFLAGS               += -mno-red-zone
 #
 ELF2EFI                = $(ELF2EFI64)
 
-# Specify EFI boot file
-#
-EFI_BOOT_FILE  = bootx64.efi
-
 # Include generic EFI Makefile
 #
 MAKEDEPS       += arch/x86/Makefile.efi