grub: align splashscreen handling with iso9660 code

This commit aligns the Grub handling of the splash screen with what is
done in the ISO9660 code.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 3be4a7401b3d56c0d9d2a0d7f89c0e9f81d1759f..d22df8899d81ce6954f573cb70dd18d31a2d038e 100644 (file)
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -82,7 +82,10 @@ GRUB_CONF_OPT = \
 ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
 define GRUB_INSTALL_SPLASH
        cp boot/grub/splash.xpm.gz $(TARGET_DIR)/boot/grub/
-       $(SED) 's/^#splashimage/splashimage/' $(TARGET_DIR)/boot/grub/menu.lst
+endef
+else
+define GRUB_INSTALL_SPLASH
+       $(SED) '/^splashimage/d' $(TARGET_DIR)/boot/grub/menu.lst
 endef
 endif
 

diff --git a/boot/grub/menu.lst b/boot/grub/menu.lst
index 7845feea7c24fbdab8955880c9fd9e912ea6444b..a231f7eaa51b7c918f871fa3e4cb045fc7de3520 100644 (file)
--- a/boot/grub/menu.lst
+++ b/boot/grub/menu.lst
@@ -1,7 +1,16 @@
-default=0
-timeout=5
-#splashimage=(hd0,0)/boot/grub/splash.xpm.gz
-hiddenmenu
+default                0
+timeout                10
+
+# Used when no splashimage is used
+color          cyan/blue white/blue
+
+# Gets enabled/disabled depending on Grub support for splashimage
+splashimage    (hd0,0)/boot/grub/splash.xpm.gz
+
+# Used when a splashimage is enabled
+foreground     000000
+background     cccccc
+
 title Buildroot
        root (hd0,0)
        kernel /boot/bzImage rw root=/dev/sda1