From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1czrz0-000052-GK for mharc-grub-devel@gnu.org; Sun, 16 Apr 2017 17:45:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1czryv-0008V0-Fc for grub-devel@gnu.org; Sun, 16 Apr 2017 17:45:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1czryu-0004qu-FB for grub-devel@gnu.org; Sun, 16 Apr 2017 17:45:17 -0400 Received: from mail.gw90.de ([2a01:4f8:100:7463::3]:47824) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1czryu-0004q3-8k for grub-devel@gnu.org; Sun, 16 Apr 2017 17:45:16 -0400 Received: from [2a02:8109:8ac0:1c7f:5e33:e478:c88b:8ec4] (helo=mattotaupa) by mail.gw90.de with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1czryq-0007J0-0j for grub-devel@gnu.org; Sun, 16 Apr 2017 21:45:12 +0000 Message-ID: <1492379105.2561.128.camel@users.sourceforge.net> Subject: [PATCH] Makefile.am: Add `all_video` to `default_payload.elf` From: Paul Menzel To: grub-devel@gnu.org Date: Sun, 16 Apr 2017 23:45:05 +0200 In-Reply-To: <1492371090.2561.114.camel@users.sourceforge.net> References: <1492251954.3639.117.camel@users.sourceforge.net> <1492371090.2561.114.camel@users.sourceforge.net> Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-sdhnHtAtZRiUdbcKmaX4" X-Mailer: Evolution 3.22.6-1 Mime-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a01:4f8:100:7463::3 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Apr 2017 21:45:21 -0000 --=-sdhnHtAtZRiUdbcKmaX4 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 for a GRUB coreboot payload, add this module also to `default_payload.elf` by default. That avoids aa missing module error by GRUB, forcing the user to hit enter during the start process. --- 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=3D. ./grub-mkstandalone --grub-mkimage=3D./grub-mkimage -O i38= 6-coreboot -o $@ --modules=3D'ahci pata ehci uhci ohci usb_keyboard usbms p= art_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-= modules=3D'ls linux search configfile normal cbtime cbls memrw iorw minicmd= lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test s= erial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(shell cat g= rub-core/fs.lst) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --fonts=3D --the= mes=3D --locales=3D -d grub-core/ /boot/grub/grub.cfg=3D$(srcdir)/coreboot.= cfg + pkgdatadir=3D. ./grub-mkstandalone --grub-mkimage=3D./grub-mkimage -O i38= 6-coreboot -o $@ --modules=3D'ahci pata ehci uhci ohci usb_keyboard usbms p= art_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-= modules=3D'ls linux search configfile normal cbtime cbls memrw iorw minicmd= lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test s= erial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu all_video $(s= hell cat grub-core/fs.lst) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --font= s=3D --themes=3D --locales=3D -d grub-core/ /boot/grub/grub.cfg=3D$(srcdir)= /coreboot.cfg endif =20 endif --=20 2.11.0 --=-sdhnHtAtZRiUdbcKmaX4 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQQ8+w9d414FAVARIpk9fVorbA4dWAUCWPPl4QAKCRA9fVorbA4d WL3qAJ9oEBNT5OsloeN2QZwmY6tKbwnd+wCfSHmBC0n161ieB5n5bBNASAfoY9o= =00Tj -----END PGP SIGNATURE----- --=-sdhnHtAtZRiUdbcKmaX4--