From 1f99c6988968cfa930a0dde5e90a24bd56578f18 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sat, 07 Feb 2015 10:45:46 -0500
Subject: buildrom-withgrub: Put background.jpg in CBFS, not GRUB memdisk

The background.jpg was put in CBFS originally to save space inside
CBFS because the GRUB payload is LZMA compressed by coreboot. The
actual measured saving in space for background.jpg being in the
memdisk was about 4KiB.

Putting it in CBFS means that the user can easily change their
background image if they want to.
---
diff --git a/buildrom-withgrub b/buildrom-withgrub
index 7baafa3..d904241 100755
--- a/buildrom-withgrub
+++ b/buildrom-withgrub
@@ -68,6 +68,12 @@ do
 	mv build/coreboot.rom "$1"_"$romtype".rom
 	# .config no longer needed
 	rm -f .config
+	
+	# Add the background image
+	if [ "$romtype" = "vesafb" ]
+	then
+		./util/cbfstool/cbfstool "$1"_"$romtype".rom add -f ../resources/grub/background/background.jpg -n background.jpg -t raw
+	fi
 
 	# Add the correct GRUB configuration file for this image.
 	for keymap in $(ls ../resources/utilities/grub-assemble/keymap/original)
diff --git a/resources/grub/config/extra/vesafb.cfg b/resources/grub/config/extra/vesafb.cfg
index bf56ced..6eaedf7 100644
--- a/resources/grub/config/extra/vesafb.cfg
+++ b/resources/grub/config/extra/vesafb.cfg
@@ -1,5 +1,5 @@
 insmod jpeg
 
-background_image (memdisk)/background.jpg
+background_image (cbfsdisk)/background.jpg
 loadfont (memdisk)/dejavusansmono.pf2
 
diff --git a/resources/utilities/grub-assemble/gen.sh b/resources/utilities/grub-assemble/gen.sh
index b784366..b4ae7ad 100755
--- a/resources/utilities/grub-assemble/gen.sh
+++ b/resources/utilities/grub-assemble/gen.sh
@@ -31,7 +31,6 @@ then
 	  --modules="$grub_modules" \
 	  --install-modules="$grub_install_modules" \
 	  /boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \
-	  /background.jpg="../../../resources/grub/background/background.jpg" \
 	  /dejavusansmono.pf2="../../../resources/grub/font/dejavusansmono.pf2" \
 	  $(./grub_memdisk_keymap)
 elif [ "$1" = "txtmode" ]
--
cgit v0.9.1