GRUB: change background to libreboot logo, with grey background

9 files changed, 220 insertions, 10 deletions

diff --git a/grub.cfg b/grub.cfg
new file mode 100644
index 00000000..189cdb5d
--- /dev/null
+++ b/grub.cfg
@@ -0,0 +1,148 @@
+set prefix=(memdisk)/boot/grub
+
+insmod nativedisk
+insmod ehci
+insmod ohci
+insmod uhci
+insmod usb
+insmod usbserial_pl2303
+insmod usbserial_ftdi
+insmod usbserial_usbdebug
+
+# Serial and keyboard configuration, very important.
+serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
+terminal_input --append  serial
+terminal_output --append serial
+terminal_input --append at_keyboard
+
+gfxpayload=keep
+terminal_output --append gfxterm
+
+# Default to first option, automatically boot after 1 second
+set default="0"
+set timeout=1
+
+# This is useful when using 'cat' on long files on GRUB terminal
+set pager=1
+
+# # Play a beep on startup
+# play 480 440 1
+insmod jpeg
+
+background_image (cbfsdisk)/background.png
+loadfont (memdisk)/dejavusansmono.pf2
+
+keymap ukqwerty
+menuentry 'Load Operating System' {
+	insmod ahci
+	insmod part_msdos
+	insmod part_gpt
+	for x in (ahci0,1) (ahci0,2) (ahci0,3) (ahci0,4); do
+		if [ -f "$x/grub/libreboot_grub.cfg" ] ; then
+			set root=$x
+			configfile /grub/libreboot_grub.cfg
+		fi
+		if [ -f "$x/boot/grub/libreboot_grub.cfg" ] ; then
+			set root=$x
+			configfile /boot/grub/libreboot_grub.cfg
+		fi
+	done
+
+	set root='ahci0,1'
+	linux  /vmlinuz root=/dev/sda1 rw
+	if [ -f "/initrd.img" ] ; then
+		initrd /initrd.img
+	fi
+}
+menuentry 'Parse ISOLINUX menu (ahci0)' {
+	insmod ahci
+	insmod part_msdos
+	insmod part_gpt
+	for x in (ahci0,1) (ahci0,2) (ahci0,3) (ahci0,4); do
+		set root=$x
+		if [ -f "/isolinux/isolinux.cfg" ] ; then
+			syslinux_configfile -i /isolinux/isolinux.cfg
+		elif [ -f "/syslinux/syslinux.cfg" ] ; then
+			syslinux_configfile -i /syslinux/syslinux.cfg
+		elif [ -f "/boot/isolinux/isolinux.cfg" ] ; then
+			syslinux_configfile -i /boot/isolinux/isolinux.cfg
+		elif [ -f "/boot/syslinux/syslinux.cfg" ] ; then
+			syslinux_configfile -i /boot/syslinux/syslinux.cfg
+		fi
+	done
+}
+menuentry 'Parse ISOLINUX menu (USB)' {
+	insmod usbms
+	insmod part_msdos
+	insmod part_gpt
+	for x in (usb0) (usb0,1) (usb0,2) (usb0,3) (usb0,4); do
+		set root=$x
+		if [ -f "/isolinux/isolinux.cfg" ] ; then
+			syslinux_configfile -i /isolinux/isolinux.cfg
+		elif [ -f "/syslinux/syslinux.cfg" ] ; then
+			syslinux_configfile -i /syslinux/syslinux.cfg
+		elif [ -f "/boot/isolinux/isolinux.cfg" ] ; then
+			syslinux_configfile -i /boot/isolinux/isolinux.cfg
+		elif [ -f "/boot/syslinux/syslinux.cfg" ] ; then
+			syslinux_configfile -i /boot/syslinux/syslinux.cfg
+		fi
+	done
+}
+menuentry 'Parse ISOLINUX menu (CD/DVD)' {
+	insmod ahci
+	insmod ata
+	insmod iso9660
+	for x in (ata0) (ahci1); do
+		set root=$x
+		if [ -f "/isolinux/isolinux.cfg" ] ; then
+			syslinux_configfile -i /isolinux/isolinux.cfg
+		elif [ -f "/syslinux/syslinux.cfg" ] ; then
+			syslinux_configfile -i /syslinux/syslinux.cfg
+		elif [ -f "/boot/isolinux/isolinux.cfg" ] ; then
+			syslinux_configfile -i /boot/isolinux/isolinux.cfg
+		elif [ -f "/boot/syslinux/syslinux.cfg" ] ; then
+			syslinux_configfile -i /boot/syslinux/syslinux.cfg
+		fi
+	done
+}
+menuentry 'Switch to grubtest.cfg' {
+	set root='cbfsdisk'
+	configfile (cbfsdisk)/grubtest.cfg
+}
+menuentry 'Search for GRUB configuration (grub.cfg) outside of CBFS' {
+	insmod ahci
+	insmod usbms
+	insmod part_msdos
+	insmod part_gpt
+	for x in (ahci0,1) (ahci0,2) (ahci0,3) (ahci0,4) (usb0) (usb0,1) (usb0,2) (usb0,3) (usb0,4); do
+		if [ -f "$x/grub/grub.cfg" ] ; then
+			submenu "Load Config from $x" $x { 
+				root=$2
+				source /grub/grub.cfg
+				unset superusers
+			}
+		fi
+		if [ -f "$x/boot/grub/grub.cfg" ] ; then
+			submenu "Load Config from $x" $x {
+				root=$2
+				source /boot/grub/grub.cfg
+				unset superusers
+			}
+		fi
+		if [ -f "$x/grub2/grub.cfg" ] ; then
+			submenu "Load Config from $x" $x { 
+				root=$2
+				source /grub2/grub.cfg
+				unset superusers
+			}
+		fi
+		if [ -f "$x/boot/grub2/grub.cfg" ] ; then
+			submenu "Load Config from $x" $x {
+				root=$2
+				source /boot/grub2/grub.cfg
+				unset superusers
+			}
+		fi
+	done
+}
+
diff --git a/resources/grub/background/COPYING b/resources/grub/background/COPYING
index b9167661..cb520e1e 100644
--- a/resources/grub/background/COPYING
+++ b/resources/grub/background/COPYING
@@ -1,7 +1,3 @@
-background.jpg is based on https://www.gnu.org/graphics/meditate.xcf.gz
-which can be found at https://www.gnu.org/graphics/meditate.html
-Check that webpage for licensing information to see what conditions the image falls under.
-
-gnulove.jpg based on the image found at https://www.gnu.org/graphics/gnulove.html
-
-Look at those pages to see what copyright license they fall under.
+These images are based on http://libreboot.org/logo/logo.svg
+which is Copyright 2014 Marcus Moeller and released under CC-0
+https://creativecommons.org/publicdomain/zero/1.0/legalcode
\ No newline at end of file
diff --git a/resources/grub/background/background.jpg b/resources/grub/background/background.jpg
deleted file mode 100644
index 0244adfd..00000000
--- a/resources/grub/background/background.jpg
+++ /dev/null
diff --git a/resources/grub/background/background1024x768.png b/resources/grub/background/background1024x768.png
new file mode 100644
index 00000000..cd726be8
--- /dev/null
+++ b/resources/grub/background/background1024x768.png
diff --git a/resources/grub/background/background1280x800.png b/resources/grub/background/background1280x800.png
new file mode 100644
index 00000000..96d28b14
--- /dev/null
+++ b/resources/grub/background/background1280x800.png
diff --git a/resources/grub/background/gnulove.jpg b/resources/grub/background/gnulove.jpg
deleted file mode 100644
index 63582716..00000000
--- a/resources/grub/background/gnulove.jpg
+++ /dev/null
diff --git a/resources/grub/background/logo.svg b/resources/grub/background/logo.svg
new file mode 100644
index 00000000..62147c1d
--- /dev/null
+++ b/resources/grub/background/logo.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="80mm"
+   height="80mm"
+   viewBox="0 0 283.46457 283.46456"
+   id="svg3349"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Libreboot_Logo_Deer_only_black.svg">
+  <defs
+     id="defs3351" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="507.97245"
+     inkscape:cy="-55.115733"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1150"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3354">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-244.04728,-370.46192)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path10"
+       d="m 461.38431,532.68555 0.79438,-2.14488 c 1.82712,-4.76644 3.49543,-9.77117 4.76645,-14.93478 0.39734,-1.35049 0.55641,-2.62157 0.63551,-3.89259 -0.15906,2.78039 -0.0792,1.03274 0,-0.63551 0.39734,-7.86464 0.31751,-11.91611 -0.15906,-15.96757 -0.31751,-2.93927 -0.5558,-5.79912 -0.5558,-8.65898 -0.0792,-2.54209 -0.15906,-4.92532 -0.39735,-7.30854 -0.0792,-1.03273 -0.0792,-2.06541 -0.0792,-3.17761 0,-3.57483 0.39735,-7.0702 1.27108,-10.56556 l 1.27102,-0.55641 c 4.76644,-2.14494 8.97679,-5.32255 12.39274,-9.29454 l 1.66825,0 c 1.90659,0 3.81312,-0.23829 5.64024,-0.71498 2.38322,-0.55641 4.68703,-1.4299 6.91132,-2.46263 1.03273,-0.47657 1.98599,-1.1122 2.78044,-1.82712 0.55641,-0.55641 1.03268,-1.27108 1.4299,-1.98606 0.47657,-1.03267 1.27108,-1.82712 2.30375,-2.30375 0.95333,-0.47658 1.74772,-1.11215 2.14494,-2.06547 0.39735,-0.71492 0.31751,-1.58878 -0.0792,-2.30376 -0.47657,-0.79438 -1.27108,-1.50936 -2.14494,-1.74771 -0.95327,-0.39734 -1.90653,-0.71492 -2.78039,-1.11214 -1.58883,-0.71498 -2.85985,-1.27108 -4.05146,-1.82712 -0.63551,-0.31751 -2.62151,-1.03273 -4.60751,-1.50937 -2.14493,-0.63551 -4.21034,-1.1122 -6.27581,-1.66824 -1.58883,-0.47657 -4.05146,-1.50937 -6.27581,-2.93932 -2.93926,-1.74772 -5.95799,-3.25702 -9.05619,-4.44869 -2.22429,-0.8738 -4.68698,-1.35049 -7.14961,-1.50937 l -3.0982,0 -0.23829,-0.55641 -1.03273,-4.76638 -0.63551,-3.89259 -0.31751,-1.986 0.71498,-0.39734 c 3.49536,-2.22435 6.5141,-5.0048 8.97673,-8.26181 0.5564,-0.63551 0.71497,-1.42996 0.5564,-2.22435 -0.15906,-1.11214 -1.19161,-1.90659 -2.30375,-1.90659 -0.47657,0 -0.95326,0.15906 -1.27108,0.47657 l -3.17761,2.06547 c -2.14487,1.50937 -4.36922,2.78045 -6.67297,3.97206 l -0.47657,-0.63557 c -2.62157,-3.01874 -4.13094,-6.91132 -4.13094,-10.96279 l 0,-1.58877 c 0.23829,-1.66825 0.47657,-3.49537 0.71498,-5.40196 0.0792,-0.55641 0,-1.11214 -0.15906,-1.58883 -0.31751,-0.71492 -0.55579,-1.4299 -0.8738,-1.986 -0.15906,-0.55641 -0.6355,-0.95327 -1.19161,-1.03274 -0.63551,0 -1.19161,0 -1.74771,0.23829 -0.55641,0.23829 -1.19161,0.47657 -1.74765,0.79439 -0.55641,0.31751 -0.87386,0.79438 -1.03273,1.42989 -0.95333,3.01874 -1.35049,6.11694 -1.35049,9.29455 0,3.73371 0.63551,7.46742 1.82712,11.04225 0.55641,1.27102 1.11214,2.54204 1.82712,3.65424 1.19161,2.06547 2.22434,4.13088 3.17761,6.27581 1.27108,3.09814 1.90659,6.35522 1.90659,9.69171 l 0,0.71498 -1.03274,0.55641 c -2.5421,1.50936 -4.60756,3.73371 -5.87858,6.43468 l -0.95327,0 c -3.6543,0.31751 -7.22907,1.11215 -10.56562,2.46264 -2.06541,0.79438 -3.972,2.06546 -5.48136,3.57483 -0.31751,0.39735 -0.63551,0.87386 -0.79439,1.35049 l 0.8738,0.39734 1.19161,0.71498 1.19161,0.71492 1.03273,0.63557 c 0.47657,0.31751 1.03274,0.55641 1.58884,0.71492 1.35049,0.23828 2.62151,0.47657 3.97199,0.47657 2.30376,0.0792 4.60757,0.47657 6.83192,1.1122 l -0.55641,1.11215 c -0.63557,1.27108 -1.19161,2.54209 -1.66825,3.81318 -1.1122,3.49536 -2.06546,6.99072 -2.78044,10.48609 -1.58884,7.70577 -3.17761,14.85537 -4.92532,22.00504 -0.47658,2.14487 -1.4299,4.28975 -2.5421,6.27581 -4.28976,7.54683 -10.64497,13.6637 -18.35074,17.55629 -4.05147,2.14488 -8.42069,3.49543 -12.94879,4.28981 -7.30848,1.11214 -14.61702,1.82712 -21.8461,2.06541 -5.56083,0.15906 -11.36001,0.71498 -17.00025,1.82718 -2.62157,0.47657 -5.16361,0.95326 -7.6263,1.50937 -4.28975,0.87385 -8.57956,2.22428 -12.71044,3.97199 -4.76644,1.986 -9.21513,4.5281 -13.18713,7.70571 -3.33648,2.62157 -5.87858,6.11693 -7.30854,10.1684 -0.23829,0.55641 -0.31751,1.19161 -0.31751,1.82712 0,1.35049 0.47657,2.62151 1.42996,3.65424 0.95326,1.03273 2.30375,1.42996 3.65424,1.19161 l -1.11214,1.90659 c -0.47657,0.63551 -0.79439,1.35049 -1.11214,2.06547 -0.63558,1.74765 -1.19162,3.41596 -1.66831,5.24308 -1.35049,4.92526 -2.46263,9.6917 -3.41589,14.53755 -0.31751,1.82713 -1.50937,3.73372 -3.33655,5.0842 -0.63551,0.47658 -1.35049,0.95333 -2.06541,1.19162 -1.986,0.87385 -4.05146,1.50936 -6.03746,1.98599 -2.62157,0.55641 -5.0842,1.19161 -7.46742,1.74772 -0.55641,0.15906 -1.27102,0.63551 -1.74772,1.27102 -0.63551,0.95332 -1.11214,1.90659 -1.27102,3.01873 -0.15906,0.79445 -0.3175,1.50942 -0.39734,2.30381 -0.71498,4.28975 -1.74772,8.65897 -3.17761,12.78991 -1.42996,4.21034 -3.25708,8.34122 -5.32255,12.31327 -0.71492,1.35049 -1.42989,2.5421 -2.30375,3.81312 -0.63551,0.95327 -1.35049,2.06547 -1.82712,3.17761 -0.47657,0.95327 -0.95327,1.82712 -1.50937,2.70098 -0.31751,0.55641 -0.95332,1.03273 -1.58883,1.27108 l -0.87386,0.15906 c -1.66824,0.31751 -3.25702,0.79439 -4.68697,1.58877 -1.58878,0.79445 -3.09814,1.58884 -4.68692,2.38323 -3.49542,1.82712 -7.0702,5.16367 -9.6123,9.29454 -0.15906,0.31751 -0.31751,0.79439 -0.31751,1.27102 0,0.31751 0.0792,0.71498 0.23829,1.1122 0.47657,0.95327 1.50937,1.50937 2.5421,1.50937 10.00946,0.23828 19.54229,-3.89259 26.29473,-11.36001 1.98606,-2.22429 4.21034,-4.76639 6.51416,-7.22908 7.86458,-8.73844 12.63103,-15.01425 16.7619,-21.68722 0.31751,-0.47657 0.71498,-0.71498 1.1122,-0.71498 0.23829,0 0.39735,0 0.55641,0.0792 0.79439,0.39735 1.50937,0.63557 2.38316,0.71498 1.03274,0.23829 2.4627,0.39735 3.89259,0.71498 1.82712,0.23829 3.65431,0.31751 5.40196,0 2.85985,-0.39735 5.71971,-1.03273 8.42068,-1.986 4.05147,-1.35049 7.86459,-3.41595 11.20114,-6.11693 5.40195,-4.21034 10.64497,-8.89732 15.80863,-13.74323 2.5421,-2.46263 5.48137,-4.36922 8.73845,-5.71971 9.05619,-3.81312 18.74796,-6.27575 28.59854,-7.22908 3.65424,-0.31751 7.46742,-0.63551 11.20113,-0.79438 2.22429,-0.15907 4.5281,-0.39735 6.75238,-0.95327 2.62157,-0.71498 6.11694,-1.50936 9.6123,-2.38322 3.6543,-1.03274 6.1964,-1.74771 8.57957,-2.70098 4.05152,-1.50936 8.02352,-3.25708 11.91611,-5.00473 l 1.19161,0.47657 c 1.4299,0.71492 3.01873,1.11214 4.68697,1.27102 5.24308,0.23829 10.56557,-0.31751 15.64977,-1.82712 l 4.36922,-1.19161 2.14487,-0.63551 2.14488,-0.71498 3.01873,-0.95326 2.70098,-0.87386 c 1.98606,-0.55641 3.97205,-1.19161 6.03746,-1.82712 3.0982,-0.87386 4.92532,-1.35049 6.83191,-1.74771 l -1.11214,1.98599 -6.43469,12.47216 -6.59356,12.31327 -0.0792,0.23829 -1.66824,0.31751 c -1.27108,0.15906 -2.5421,0.47657 -3.73371,0.95332 -4.76645,1.90653 -9.29454,4.36922 -13.34601,7.46736 -1.35049,1.11221 -2.5421,2.46269 -3.25702,4.13094 -0.15906,0.31751 -0.47657,0.71498 -0.71498,1.03273 -0.23828,0.23829 -0.31751,0.5558 -0.31751,0.8738 0,0.39734 0.23829,0.87385 0.63551,1.1122 0.71498,0.39735 1.50937,0.87386 2.30376,1.27102 0.15906,0.0792 0.47657,0.15906 0.71498,0.23828 0.87385,0.0792 1.74771,0.15907 2.70097,0.15907 1.11221,0.0792 2.22435,0.15906 3.41596,0.23828 1.03273,0.0792 1.986,0 2.85985,-0.31751 1.50937,-0.47657 3.09814,-1.03273 4.60757,-1.74765 1.986,-0.95333 3.89253,-1.98606 5.71971,-3.17767 1.4299,-0.95327 2.78039,-2.06541 3.972,-3.33649 0.63551,-0.63551 2.38322,-2.46263 4.13087,-4.36922 5.00479,-5.16361 8.02352,-8.65897 10.88338,-12.2338 2.38316,-2.93933 4.5281,-5.95806 6.75244,-8.97679 1.986,-2.85986 3.81312,-5.6403 5.48136,-8.57956 0.87386,-1.42996 1.58884,-2.85986 2.38323,-4.36922 0.63551,-1.27109 1.11214,-2.70098 1.27101,-4.05147 0.31751,-1.58884 0,-3.25708 -0.79438,-4.60757 -0.63551,-0.95326 -1.42996,-1.66824 -2.46263,-2.22428 -0.55641,-0.23829 -1.11221,-0.39735 -1.74772,-0.55641 -0.39734,-0.0792 -0.79438,-0.23829 -1.19161,-0.47657 -1.11214,-0.79445 -2.38322,-1.35049 -3.73371,-1.66824 -0.55641,-0.15907 -1.27102,-0.23829 -1.90653,-0.23829 l -5.00479,0.15906 -2.70097,0.15906 -4.28976,0.15907 -10.16839,0 -4.05147,0.15906 c -4.8547,0.20942 -9.70939,1.08125 -14.23307,2.43837 z"
+       style="fill:#000000" />
+  </g>
+</svg>
diff --git a/resources/grub/config/extra/vesafb.cfg b/resources/grub/config/extra/vesafb.cfg
index 6eaedf7a..6831686f 100644
--- a/resources/grub/config/extra/vesafb.cfg
+++ b/resources/grub/config/extra/vesafb.cfg
@@ -1,5 +1,5 @@
 insmod jpeg
 
-background_image (cbfsdisk)/background.jpg
+background_image (cbfsdisk)/background.png
 loadfont (memdisk)/dejavusansmono.pf2
 
diff --git a/resources/scripts/helpers/build/roms/helper b/resources/scripts/helpers/build/roms/helper
index 5fcd4c06..aa2dcc7e 100755
--- a/resources/scripts/helpers/build/roms/helper
+++ b/resources/scripts/helpers/build/roms/helper
@@ -84,9 +84,9 @@ do
 	then
 		if [ "$1" = "macbook21" ] || [ "$1" = "x200_4mb" ] || [ "$1" = "x200_8mb" ] || [ "$1" = "r400_4mb" ] || [ "$1" = "r400_8mb" ] || [ "$1" = "t400_4mb" ] || [ "$1" = "t400_8mb" ] || [ "$1" = "t500_4mb" ] || [ "$1" = "t500_8mb" ]
 		then
-			./util/cbfstool/cbfstool "$1"_"$romtype".rom add -f ../resources/grub/background/gnulove.jpg -n background.jpg -t raw
+			./util/cbfstool/cbfstool "$1"_"$romtype".rom add -f ../resources/grub/background/background1280x800.png -n background.png -t raw
 		else
-			./util/cbfstool/cbfstool "$1"_"$romtype".rom add -f ../resources/grub/background/background.jpg -n background.jpg -t raw
+			./util/cbfstool/cbfstool "$1"_"$romtype".rom add -f ../resources/grub/background/background1024x768.png -n background.png -t raw
 		fi
 	fi