projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 418c3a2)
grub: really disable splash screen support
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 28 Dec 2013 14:56:38 +0000 (15:56 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sun, 29 Dec 2013 11:18:30 +0000 (12:18 +0100)
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>
boot/grub/grub.mk patch | blob | history

diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 43121ff7a47013fcdda087cab9f7c7b4dbaa565c..3be4a7401b3d56c0d9d2a0d7f89c0e9f81d1759f 100644 (file)
--- 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