diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2014-11-21 19:57:46 +0000 |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2014-11-21 19:57:46 +0000 |
| commit | 1a4829c92dde3bde267530fdb28ce5265355568b (patch) | |
| tree | 03fbf880815c073e9fd7a478508c2340742f406a /resources/libreboot | |
| parent | 3e1712768172e53ed02da96e1bb392edaa219de7 (diff) | |
Revert "buildrom-withgrub: Only include 1 keymap file in GRUB memdisk."
This reverts commit 3e1712768172e53ed02da96e1bb392edaa219de7.
Diffstat (limited to 'resources/libreboot')
| -rw-r--r-- | resources/libreboot/config/macbook21/config | 6 | ||||
| -rw-r--r-- | resources/libreboot/config/t60/config | 6 | ||||
| -rw-r--r-- | resources/libreboot/config/x60/config | 6 | ||||
| -rw-r--r-- | resources/libreboot/config/x60t/config | 6 |
4 files changed, 16 insertions, 8 deletions
diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/macbook21/config index 65a947c..f443f49 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=y -# CONFIG_PAYLOAD_ELF is not set +# CONFIG_PAYLOAD_NONE is not set +CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_SEABIOS is not set # CONFIG_PAYLOAD_FILO is not set @@ -426,6 +426,8 @@ CONFIG_PAYLOAD_NONE=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 967e912..d2c1c68 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=y -# CONFIG_PAYLOAD_ELF is not set +# CONFIG_PAYLOAD_NONE is not set +CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_SEABIOS is not set # CONFIG_PAYLOAD_FILO is not set @@ -440,6 +440,8 @@ CONFIG_PAYLOAD_NONE=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 5646622..1757aeb 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=y -# CONFIG_PAYLOAD_ELF is not set +# CONFIG_PAYLOAD_NONE is not set +CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_SEABIOS is not set # CONFIG_PAYLOAD_FILO is not set @@ -443,6 +443,8 @@ CONFIG_PAYLOAD_NONE=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 0fe2b17..e5b6f19 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=y -# CONFIG_PAYLOAD_ELF is not set +# CONFIG_PAYLOAD_NONE is not set +CONFIG_PAYLOAD_ELF=y # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_SEABIOS is not set # CONFIG_PAYLOAD_FILO is not set @@ -443,6 +443,8 @@ CONFIG_PAYLOAD_NONE=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 |