Commit 5cab919b authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
parent e962b2a2

boot/grub/grub.mk

+4 −1
Original line number Diff line number Diff line
@@ -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

boot/grub/menu.lst

+13 −4
Original line number Diff line number Diff line 
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