summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2014-11-22 00:19:19 (EST)
committer Francis Rowe <info@gluglug.org.uk>2014-11-22 00:19:19 (EST)
commitc75a98b208a959df50c287d4fb4261e41a6b926b (patch)
tree1b81459e0f22ae9b643eb712c511fc59931b50f1
parent5a8ea556881dca34aefe2d8709c6576e488276f0 (diff)
downloadlibreboot-c75a98b208a959df50c287d4fb4261e41a6b926b.zip
libreboot-c75a98b208a959df50c287d4fb4261e41a6b926b.tar.gz
libreboot-c75a98b208a959df50c287d4fb4261e41a6b926b.tar.bz2
buildrom-withgrub: Remove unnecessary if condition
-rwxr-xr-xbuildrom-withgrub12
1 files changed, 4 insertions, 8 deletions
diff --git a/buildrom-withgrub b/buildrom-withgrub
index 594fba1..cdc90d9 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