diff --git a/resources/scripts/blobs/inject b/resources/scripts/blobs/inject
index fbf5fe4d..18d91f2c 100755
--- a/resources/scripts/blobs/inject
+++ b/resources/scripts/blobs/inject
@@ -55,7 +55,7 @@ Detect_board(){
 		grub_*)
 		board=$(cut -d '_' -f2-3 <<<${filename})
 		;;
-		seabios_grubfirst_*|seabios_withgrub_*)
+		seabios_withgrub_*)
 		board=$(cut -d '_' -f3-4 <<<${filename})
 		;;
 		*)
diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper
index 3fdc53f2..06820b43 100755
--- a/resources/scripts/build/boot/roms_helper
+++ b/resources/scripts/build/boot/roms_helper
@@ -206,7 +206,7 @@ elif [ "${arch}" = "AArch64" ]; then
 	(
 		cat version > "${cbdir}/.coreboot-version"
 		cd "${cbdir}"
-		make crossgcc-arm crossgcc-aarch64 CPUS=$(nproc) # This is for aarch64, doesn't apply to armv7
+		make crossgcc-aarch64 CPUS=$(nproc) # This is for aarch64, doesn't apply to armv7
 	)
 fi
 
@@ -456,19 +456,12 @@ mkRomsWithGrub() {
 	tmprompath="${1}"
 	initmode="${2}"
 	displaymode="${3}"
-	firstpayloadname="${4}" # allow values: grub, seabios, seabios_withgrub, seabios_grubfirst
+	firstpayloadname="${4}" # allow values: grub, seabios, seabios_withgrub
 
 	if [ "${payload_grub_withseabios}" = "y" ] && [ "${firstpayloadname}" = "grub" ]; then
 		mv "$(make_seabios_rom "${tmprompath}" "seabios.elf" "${seabios_opromloadonly}" "${initmode}")" "${tmprompath}"
 	elif [ "${payload_seabios_withgrub}" ] && [ "${firstpayloadname}" != "grub" ]; then
 		mv "$(make_seabios_rom "${tmprompath}" "fallback/payload" "${seabios_opromloadonly}" "${initmode}")" "${tmprompath}"
-		if [ "${firstpayloadname}" = "seabios_grubfirst" ]; then
-			tmpbootorder=$(mktemp -t coreboot_rom.XXXXXXXXXX)
-			printf "/rom@img/grub2\n" > "${tmpbootorder}"
-			"${cbfstool}" "${tmprompath}" add -f "${tmpbootorder}" -n bootorder -t raw
-			rm -f "${tmpbootorder}"
-			"${cbfstool}" "${tmprompath}" add-int -i 0 -n etc/show-boot-menu
-		fi
 	fi	
 
 	keymaps=""
@@ -538,8 +531,6 @@ mkRoms() {
 			tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
 			cp "${corebootrom}" "${tmprom}"
 			mkRomsWithGrub "${tmprom}" "${initmode}" "${displaymode}" "seabios_withgrub"
-			cp "${corebootrom}" "${tmprom}"
-			mkRomsWithGrub "${tmprom}" "${initmode}" "${displaymode}" "seabios_grubfirst"
 			rm -f "${tmprom}"
 		fi
 	fi