summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-12-29 17:33:47 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-12-30 23:10:44 (GMT)
commit5cab919bb3aec8270786f6bd460d677a8546c70f (patch)
tree42e1f8012df0a60b5d662b6d3286e7b2eca46970
parente962b2a2f3b0ad16740b0b6d85323f5e3456e66f (diff)
downloadbuildroot-5cab919bb3aec8270786f6bd460d677a8546c70f.tar.gz
buildroot-5cab919bb3aec8270786f6bd460d677a8546c70f.tar.bz2
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>
-rw-r--r--boot/grub/grub.mk5
-rw-r--r--boot/grub/menu.lst17
2 files changed, 17 insertions, 5 deletions
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 3be4a74..d22df88 100644
--- 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 7845fee..a231f7e 100644
--- 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