4 files changed, 8 insertions, 16 deletions
diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/macbook21/config
index f443f49e..65a947c8 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 d2c1c680..967e9122 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 1757aeb2..56466229 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 e5b6f196..0fe2b178 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