diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-12-29 18:33:47 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-12-31 00:10:44 +0100 |
| commit | 5cab919bb3aec8270786f6bd460d677a8546c70f (patch) | |
| tree | 42e1f8012df0a60b5d662b6d3286e7b2eca46970 /boot/grub | |
| parent | e962b2a2f3b0ad16740b0b6d85323f5e3456e66f (diff) | |
| download | buildroot-5cab919bb3aec8270786f6bd460d677a8546c70f.tar.gz buildroot-5cab919bb3aec8270786f6bd460d677a8546c70f.zip | |
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>
Diffstat (limited to 'boot/grub')
| -rw-r--r-- | boot/grub/grub.mk | 5 | ||||
| -rw-r--r-- | boot/grub/menu.lst | 17 |
2 files changed, 17 insertions, 5 deletions
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk index 3be4a7401b..d22df8899d 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 7845feea7c..a231f7eaa5 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 |
