From 3e1712768172e53ed02da96e1bb392edaa219de7 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Fri, 21 Nov 2014 04:40:35 -0500
Subject: buildrom-withgrub: Only include 1 keymap file in GRUB memdisk.

This is to reduce the size of the image. To accomplish this,
the payload in each coreboot configuration was set to 'None',
after which the buildrom-withgrub script was modified to
build a new grub.elf for each image. This is fast, since
building the grub.elf only takes less than a second. The
alternative was to build a new coreboot ROM per keymap,
which would have been slow.

Other files were also modified along with this, check
the diff to see everything.
---
(limited to 'resources/libreboot/config')

diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/macbook21/config
index f443f49..65a947c 100644
--- a/resources/libreboot/config/macbook21/config
+++ b/resources/libreboot/config/macbook21/config
@@ -417,8 +417,8 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # Payload
 #
-# CONFIG_PAYLOAD_NONE is not set
-CONFIG_PAYLOAD_ELF=y
+CONFIG_PAYLOAD_NONE=y
+# CONFIG_PAYLOAD_ELF is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
 # CONFIG_PAYLOAD_FILO is not set
@@ -426,8 +426,6 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
-CONFIG_PAYLOAD_FILE="grub.elf"
-CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 
 #
 # Debugging
diff --git a/resources/libreboot/config/t60/config b/resources/libreboot/config/t60/config
index d2c1c68..967e912 100644
--- a/resources/libreboot/config/t60/config
+++ b/resources/libreboot/config/t60/config
@@ -431,8 +431,8 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # Payload
 #
-# CONFIG_PAYLOAD_NONE is not set
-CONFIG_PAYLOAD_ELF=y
+CONFIG_PAYLOAD_NONE=y
+# CONFIG_PAYLOAD_ELF is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
 # CONFIG_PAYLOAD_FILO is not set
@@ -440,8 +440,6 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
-CONFIG_PAYLOAD_FILE="grub.elf"
-CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 
 #
 # Debugging
diff --git a/resources/libreboot/config/x60/config b/resources/libreboot/config/x60/config
index 1757aeb..5646622 100644
--- a/resources/libreboot/config/x60/config
+++ b/resources/libreboot/config/x60/config
@@ -434,8 +434,8 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # Payload
 #
-# CONFIG_PAYLOAD_NONE is not set
-CONFIG_PAYLOAD_ELF=y
+CONFIG_PAYLOAD_NONE=y
+# CONFIG_PAYLOAD_ELF is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
 # CONFIG_PAYLOAD_FILO is not set
@@ -443,8 +443,6 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
-CONFIG_PAYLOAD_FILE="grub.elf"
-CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 
 #
 # Debugging
diff --git a/resources/libreboot/config/x60t/config b/resources/libreboot/config/x60t/config
index e5b6f19..0fe2b17 100644
--- a/resources/libreboot/config/x60t/config
+++ b/resources/libreboot/config/x60t/config
@@ -434,8 +434,8 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # Payload
 #
-# CONFIG_PAYLOAD_NONE is not set
-CONFIG_PAYLOAD_ELF=y
+CONFIG_PAYLOAD_NONE=y
+# CONFIG_PAYLOAD_ELF is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
 # CONFIG_PAYLOAD_FILO is not set
@@ -443,8 +443,6 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
-CONFIG_PAYLOAD_FILE="grub.elf"
-CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 
 #
 # Debugging
--
cgit v0.9.1