All board: payload now named payload.elf

30 files changed, 37 insertions, 39 deletions

diff --git a/resources/libreboot/config/depthcharge/veyron_speedy/config b/resources/libreboot/config/depthcharge/veyron_speedy/config
index 673759a2..8baf734f 100644
--- a/resources/libreboot/config/depthcharge/veyron_speedy/config
+++ b/resources/libreboot/config/depthcharge/veyron_speedy/config
@@ -500,7 +500,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="depthcharge.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 
 #
diff --git a/resources/libreboot/config/grub/d510mo/config b/resources/libreboot/config/grub/d510mo/config
index 14439cba..526b9acc 100644
--- a/resources/libreboot/config/grub/d510mo/config
+++ b/resources/libreboot/config/grub/d510mo/config
@@ -507,7 +507,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/ga-g41m-es2l/config b/resources/libreboot/config/grub/ga-g41m-es2l/config
index 2b6a304c..1eb3f6c3 100644
--- a/resources/libreboot/config/grub/ga-g41m-es2l/config
+++ b/resources/libreboot/config/grub/ga-g41m-es2l/config
@@ -502,7 +502,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/kcma-d8/config b/resources/libreboot/config/grub/kcma-d8/config
index ce3d8776..abc6efbb 100644
--- a/resources/libreboot/config/grub/kcma-d8/config
+++ b/resources/libreboot/config/grub/kcma-d8/config
@@ -573,7 +573,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/kgpe-d16/config b/resources/libreboot/config/grub/kgpe-d16/config
index eabe2b41..eb414a31 100644
--- a/resources/libreboot/config/grub/kgpe-d16/config
+++ b/resources/libreboot/config/grub/kgpe-d16/config
@@ -573,7 +573,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/macbook21/config b/resources/libreboot/config/grub/macbook21/config
index c929f91a..821282a1 100644
--- a/resources/libreboot/config/grub/macbook21/config
+++ b/resources/libreboot/config/grub/macbook21/config
@@ -511,7 +511,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/qemu_i440fx_piix4/config b/resources/libreboot/config/grub/qemu_i440fx_piix4/config
index 92065d8e..17b36bb5 100644
--- a/resources/libreboot/config/grub/qemu_i440fx_piix4/config
+++ b/resources/libreboot/config/grub/qemu_i440fx_piix4/config
@@ -478,7 +478,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/qemu_q35_ich9/config b/resources/libreboot/config/grub/qemu_q35_ich9/config
index 8e04481b..bc6e0e71 100644
--- a/resources/libreboot/config/grub/qemu_q35_ich9/config
+++ b/resources/libreboot/config/grub/qemu_q35_ich9/config
@@ -479,7 +479,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/r400_16mb/config b/resources/libreboot/config/grub/r400_16mb/config
index ce96a6d8..44e314f0 100644
--- a/resources/libreboot/config/grub/r400_16mb/config
+++ b/resources/libreboot/config/grub/r400_16mb/config
@@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/r400_4mb/config b/resources/libreboot/config/grub/r400_4mb/config
index 78a4d032..e1070aea 100644
--- a/resources/libreboot/config/grub/r400_4mb/config
+++ b/resources/libreboot/config/grub/r400_4mb/config
@@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/r400_8mb/config b/resources/libreboot/config/grub/r400_8mb/config
index ea840b25..e41bedbb 100644
--- a/resources/libreboot/config/grub/r400_8mb/config
+++ b/resources/libreboot/config/grub/r400_8mb/config
@@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/t400_16mb/config b/resources/libreboot/config/grub/t400_16mb/config
index 24d2413a..57bb9771 100644
--- a/resources/libreboot/config/grub/t400_16mb/config
+++ b/resources/libreboot/config/grub/t400_16mb/config
@@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/t400_4mb/config b/resources/libreboot/config/grub/t400_4mb/config
index fc5eea80..d0478859 100644
--- a/resources/libreboot/config/grub/t400_4mb/config
+++ b/resources/libreboot/config/grub/t400_4mb/config
@@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/t400_8mb/config b/resources/libreboot/config/grub/t400_8mb/config
index ada220f8..1015c872 100644
--- a/resources/libreboot/config/grub/t400_8mb/config
+++ b/resources/libreboot/config/grub/t400_8mb/config
@@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/t500_16mb/config b/resources/libreboot/config/grub/t500_16mb/config
index 508ff47c..42a87f86 100644
--- a/resources/libreboot/config/grub/t500_16mb/config
+++ b/resources/libreboot/config/grub/t500_16mb/config
@@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/t500_4mb/config b/resources/libreboot/config/grub/t500_4mb/config
index 34418750..aa04a944 100644
--- a/resources/libreboot/config/grub/t500_4mb/config
+++ b/resources/libreboot/config/grub/t500_4mb/config
@@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/t500_8mb/config b/resources/libreboot/config/grub/t500_8mb/config
index 1090e596..91b1b389 100644
--- a/resources/libreboot/config/grub/t500_8mb/config
+++ b/resources/libreboot/config/grub/t500_8mb/config
@@ -505,7 +505,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/t60/config b/resources/libreboot/config/grub/t60/config
index 581381e8..bc9e968d 100644
--- a/resources/libreboot/config/grub/t60/config
+++ b/resources/libreboot/config/grub/t60/config
@@ -527,7 +527,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/x200_16mb/config b/resources/libreboot/config/grub/x200_16mb/config
index 9849398e..29248ddb 100644
--- a/resources/libreboot/config/grub/x200_16mb/config
+++ b/resources/libreboot/config/grub/x200_16mb/config
@@ -488,7 +488,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/x200_4mb/config b/resources/libreboot/config/grub/x200_4mb/config
index 45829ed0..8bcd1dd6 100644
--- a/resources/libreboot/config/grub/x200_4mb/config
+++ b/resources/libreboot/config/grub/x200_4mb/config
@@ -488,7 +488,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/x200_8mb/config b/resources/libreboot/config/grub/x200_8mb/config
index f4971808..22ac1187 100644
--- a/resources/libreboot/config/grub/x200_8mb/config
+++ b/resources/libreboot/config/grub/x200_8mb/config
@@ -488,7 +488,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/grub/x60/config b/resources/libreboot/config/grub/x60/config
index 0f0d3735..88a86743 100644
--- a/resources/libreboot/config/grub/x60/config
+++ b/resources/libreboot/config/grub/x60/config
@@ -532,7 +532,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/seabios/kcma-d8/config b/resources/libreboot/config/seabios/kcma-d8/config
index ce3d8776..abc6efbb 100644
--- a/resources/libreboot/config/seabios/kcma-d8/config
+++ b/resources/libreboot/config/seabios/kcma-d8/config
@@ -573,7 +573,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/seabios/kfsn4-dre/config b/resources/libreboot/config/seabios/kfsn4-dre/config
index 4cc178bc..4939e17a 100644
--- a/resources/libreboot/config/seabios/kfsn4-dre/config
+++ b/resources/libreboot/config/seabios/kfsn4-dre/config
@@ -570,7 +570,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/libreboot/config/seabios/kgpe-d16/config b/resources/libreboot/config/seabios/kgpe-d16/config
index eabe2b41..eb414a31 100644
--- a/resources/libreboot/config/seabios/kgpe-d16/config
+++ b/resources/libreboot/config/seabios/kgpe-d16/config
@@ -573,7 +573,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="seabios.elf"
+CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/resources/scripts/helpers/build/roms/withdepthcharge b/resources/scripts/helpers/build/roms/withdepthcharge
index a5adc2e9..d12eb537 100755
--- a/resources/scripts/helpers/build/roms/withdepthcharge
+++ b/resources/scripts/helpers/build/roms/withdepthcharge
@@ -105,12 +105,12 @@ builddepthcharge() {
 		cd "depthcharge/"
 
 		make distclean
-		rm -f "../coreboot/${cbrevision:?}/${cbrevision:?}/depthcharge.elf"
+		rm -f "../coreboot/${cbrevision:?}/${cbrevision:?}/payload.elf"
 
 		make BOARD="${board}" defconfig
 		make BOARD="${board}" LIBPAYLOAD_DIR="$(pwd)/../coreboot/${cbrevision}/${cbrevision}/payloads/libpayload/install/libpayload" VB_SOURCE="$(pwd)/../coreboot/${cbrevision}/${cbrevision}/3rdparty/vboot" -j${cores} depthcharge_unified
 
-		cp "build/depthcharge.elf" "../coreboot/${cbrevision}/${cbrevision}/"
+		cp "build/depthcharge.elf" "../coreboot/${cbrevision}/${cbrevision}/payload.elf"
 
 		cd "../coreboot/${cbrevision}/${cbrevision}/"
 		git checkout master
@@ -171,7 +171,7 @@ buildcoreboot() {
 		mv "${board}/" "../../../bin/depthcharge/"
 
 		# clean this up
-		rm -f "depthcharge.elf"
+		rm -f "payload.elf"
 		rm -f *.img
 
 		git checkout master
diff --git a/resources/scripts/helpers/build/roms/withgrub b/resources/scripts/helpers/build/roms/withgrub
index 3025d97b..433ae7db 100755
--- a/resources/scripts/helpers/build/roms/withgrub
+++ b/resources/scripts/helpers/build/roms/withgrub
@@ -119,8 +119,7 @@ if [ -d "bin/grub/" ]; then
 fi
 
 # The GRUB files are no longer needed
-rm -f "coreboot/grub"*.{elf,cfg}
-rm -f "coreboot/seabios"*.elf
+rm -f "coreboot/"*.{elf,cfg}
 rm -f "coreboot/"*/*/*.{elf,cfg}
 
 printf "\n\n"
diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper
index d518e758..f5589662 100755
--- a/resources/scripts/helpers/build/roms/withgrub_helper
+++ b/resources/scripts/helpers/build/roms/withgrub_helper
@@ -68,8 +68,7 @@ git checkout ${branchname}
 )
 
 # Make sure to remove these first
-rm -f "grub."*{elf,cfg}
-rm -f "seabios"*.elf
+rm -f *.{elf,cfg}
 
 printf 'libreboot-%s\n' "${version}" > ".coreboot-version" # needed for reproducible builds in coreboot
 
@@ -110,12 +109,12 @@ do
 	make clean
 	mv "config_${romtype}" ".config"
 	cp "../../grub_${romtype}.elf" "grub.elf"
-    cp "../../../seabios/out/bios.bin.elf" "seabios.elf"
+    cp "../../../seabios/out/bios.bin.elf" "payload.elf"
 	make -j${cores}
 	mv "build/coreboot.rom" "${boardtarget}_${romtype}.rom"
 
     # We dont need seabios.elf anymore
-    rm -f "seabios.elf"
+    rm -f "payload.elf"
 
     # Add the grub.elf to CBFS
     ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-payload -c lzma -f grub.elf -n img/grub2
diff --git a/resources/scripts/helpers/build/roms/withseabios b/resources/scripts/helpers/build/roms/withseabios
index 50665be5..97ba69f6 100755
--- a/resources/scripts/helpers/build/roms/withseabios
+++ b/resources/scripts/helpers/build/roms/withseabios
@@ -49,7 +49,7 @@ else
 fi
 
 # The SeaBIOS files are no longer needed
-rm -f "coreboot/seabios"*.{elf,cfg}
-rm -f "coreboot/"*/*/*.{elf,cfg}
+rm -f coreboot/*.{elf,cfg}
+rm -f coreboot/*/*/*.{elf,cfg}
 
 printf "\n\n"
diff --git a/resources/scripts/helpers/build/roms/withseabios_helper b/resources/scripts/helpers/build/roms/withseabios_helper
index f710051a..f5b71ac4 100755
--- a/resources/scripts/helpers/build/roms/withseabios_helper
+++ b/resources/scripts/helpers/build/roms/withseabios_helper
@@ -68,7 +68,7 @@ git checkout ${branchname}
 )
 
 # Make sure to remove these first
-rm -f "seabios."*{elf,cfg}
+rm -f *{elf,cfg}
 
 printf 'libreboot-%s\n' "${version}" > ".coreboot-version" # needed for reproducible builds in coreboot
 
@@ -98,10 +98,10 @@ do
 
 	# Build coreboot ROM image
 	make clean
-	cp "../../../seabios/out/bios.bin.vga.elf" "seabios.elf"
+	cp "../../../seabios/out/bios.bin.vga.elf" "payload.elf"
     mv "config_${romtype}" .config
     make -j${cores}
-	rm -f "seabios.elf"
+	rm -f "payload.elf"
 	mv "build/coreboot.rom" "${boardtarget}_${romtype}.rom"
 
     # Now add SeaVGABIOS (SeaBIOS wrapper for coreboot native video init)