[PATCH v3] Makefile.am: Add `all_video` to `default_payload.elf`

[Paul Menzel]

Date: Sun, 16 Apr 2017 21:02:58 +0200

The module `all_video` is used in `util/grub.d/00_header.in`, and
included for grub-pc by default.

To make it easier to load such a GRUB configuration from disk with a
GRUB built as a coreboot payload, add this module also to
`default_payload.elf` by default. That avoids a missing module error by
GRUB, forcing the user to hit enter during the start process.

    error: file `/boot/grub/i386-coreboot/all_video.mod' not found.

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 7795baeb6..80a787e57 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -424,7 +424,7 @@ bootcheck: $(BOOTCHECKS)
 if COND_i386_coreboot
 default_payload.elf: grub-mkstandalone grub-mkimage FORCE
        test -f $@ && rm $@ || true
-       pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O 
i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms 
part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' 
--install-modules='ls linux search configfile normal cbtime cbls memrw iorw 
minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain 
test serial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(shell cat 
grub-core/fs.lst) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --fonts= --themes= 
--locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
+       pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O 
i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms 
part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' 
--install-modules='ls linux search configfile normal cbtime cbls memrw iorw 
minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain 
test serial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu all_video 
$(shell cat grub-core/fs.lst) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' 
--fonts= --themes= --locales= -d grub-core/ 
/boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
 endif
 
 endif
-- 
2.18.0

signature.asc
Description: This is a digitally signed message part