From c75a98b208a959df50c287d4fb4261e41a6b926b Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sat, 22 Nov 2014 05:19:19 +0000
Subject: buildrom-withgrub: Remove unnecessary if condition

---
 buildrom-withgrub | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'buildrom-withgrub')

diff --git a/buildrom-withgrub b/buildrom-withgrub
index 594fba18..cdc90d9e 100755
--- a/buildrom-withgrub
+++ b/buildrom-withgrub
@@ -33,6 +33,9 @@ cd coreboot
 # Build ROM images with text-mode and corebootfb modes.
 # ---------------------------------------------------------------------------------------------------------------
 
+cp ../resources/libreboot/config/"$1"/config config_txtmode
+sed 's/# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set/CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y/' < config_txtmode > config_vesafb
+
 for romtype in txtmode vesafb
 do
 	# Build the GRUB payload (ELF executable)
@@ -44,15 +47,8 @@ do
 	cd ../../../coreboot
 
 	# Build coreboot ROM image
-	rm -rf .config
 	make clean
-	cp ../resources/libreboot/config/"$1"/config .config
-	if [ "$romtype" = "vesafb" ]
-		then
-			mv .config config_txtmode
-			sed 's/# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set/CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y/' < config_txtmode > .config
-			rm -rf config_txtmode
-	fi
+	mv config_"$romtype" .config
 	make
 	mv build/coreboot.rom "$1"_"$romtype".rom
 	# .config no longer needed
-- 
cgit v1.2.3-70-g09d2