summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-12-28 14:56:38 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-12-29 11:18:30 (GMT)
commit6d65d8ba13dd75e6f774bc81b415889d8127ea40 (patch)
tree3a77574c32906168381371c4d943a60b70d0fc0a
parent418c3a2f90e409a7707b825d26d4bfaeb2913f3e (diff)
downloadbuildroot-6d65d8ba13dd75e6f774bc81b415889d8127ea40.tar.gz
buildroot-6d65d8ba13dd75e6f774bc81b415889d8127ea40.tar.bz2
grub: really disable splash screen support
When BR2_TARGET_GRUB_SPLASH is enabled, we were passing --enable-graphics, but when it was disabled, we were not doing anything. However, in Grub, graphics support is enabled by default, and you have to pass --disable-graphics to disable it. Fix this by passing --enable-graphics or --disable-graphics as appropriate. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-rw-r--r--boot/grub/grub.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 43121ff..3be4a74 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -22,7 +22,8 @@ GRUB_CFLAGS = \
-O0 -Wl,--build-id=none \
-fno-stack-protector
-GRUB_CONFIG-$(BR2_TARGET_GRUB_SPLASH) += --enable-graphics
+GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_SPLASH),--enable-graphics,--disable-graphics)
+
GRUB_CONFIG-$(BR2_TARGET_GRUB_DISKLESS) += --enable-diskless
GRUB_CONFIG-$(BR2_TARGET_GRUB_3c595) += --enable-3c595
GRUB_CONFIG-$(BR2_TARGET_GRUB_3c90x) += --enable-3c90x