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 <[email protected]> Acked-by: "Yann E. MORIN" <[email protected]>
JakubSvestka · Dec 30, 2013 · 5cab919 · 5cab919
1 parent e962b2a
commit 5cab919
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git 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
@@ -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