From 6d65d8ba13dd75e6f774bc81b415889d8127ea40 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 28 Dec 2013 15:56:38 +0100 Subject: [PATCH] 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 Acked-by: "Yann E. MORIN" --- boot/grub/grub.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk index 43121ff7a4..3be4a7401b 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