coreboot-gerrit November 2013

coreboot-gerrit@coreboot.org

1 participants
856 discussions

New patch to review for coreboot: e78c474 Honor vboot's request to load the VGA option ROM
by Stefan Reinauer 18 Nov '13

18 Nov '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4125 -gerrit commit e78c47401a629a46311dadac42cb9162c8e728a8 Author: Bill Richardson <wfrichar(a)chromium.org> Date: Tue Jul 10 17:54:59 2012 -0700 Honor vboot's request to load the VGA option ROM This removes an earlier patch that caused the VGA option ROM to be loaded by coreboot even in normal mode when it isn't needed. Change-Id: Ie0a331a10fff212a2394e7234a0dbb37570607b7 Signed-off-by: Bill Richardson <wfrichar(a)chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/48173 Commit-Queue: Stefan Reinauer <reinauer(a)google.com> Reviewed-by: Stefan Reinauer <reinauer(a)google.com> Tested-by: Stefan Reinauer <reinauer(a)google.com> --- src/vendorcode/google/chromeos/vbnv.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/vendorcode/google/chromeos/vbnv.c b/src/vendorcode/google/chromeos/vbnv.c index 58ccbdb..a13726d 100644 --- a/src/vendorcode/google/chromeos/vbnv.c +++ b/src/vendorcode/google/chromeos/vbnv.c @@ -143,11 +143,5 @@ int vboot_wants_oprom(void) if (!is_vbnv_initialized()) vbnv_setup(); - /* FIXME(crosbug.com/p/8789). The following commented-out line does the - * right thing, assuming that vboot has requested the option ROM and - * rebooted if it finds that it's needed but not loaded. At the moment, - * it doesn't yet do that, so we must always say we want it. */ - - /* return (vbnv_data(BOOT_OFFSET) & BOOT_OPROM_NEEDED) ? 1 : 0; */ - return 1; + return (vbnv_data(BOOT_OFFSET) & BOOT_OPROM_NEEDED) ? 1 : 0; }

1 0

Patch merged into coreboot/master: ef40209 cbfs: 64-bit cleanups
by gerrit＠coreboot.org 18 Nov '13

18 Nov '13

the following patch was just integrated into master: commit ef4020957e009f2861522549927069d6e9d39959 Author: Ronald G. Minnich <rminnich(a)google.com> Date: Mon Nov 11 10:36:28 2013 -0800 cbfs: 64-bit cleanups cbfs used u32 in a number of cases where uintptr_t was correct. This change builds for both 64-bit and 32-bit boards. Change-Id: If42c722a8a9e8d565d3827f65ed6c2cb8e90ba60 Signed-off-by: Ronald G. Minnich <rminnich(a)google.com> Reviewed-on: http://review.coreboot.org/4037 Tested-by: build bot (Jenkins) Reviewed-by: Vladimir Serbinenko <phcoder(a)gmail.com> Reviewed-by: Aaron Durbin <adurbin(a)google.com> See http://review.coreboot.org/4037 for details. -gerrit

1 0

Patch merged into coreboot/master: 7fda0e8 cbfs: remove unused code and prototype
by gerrit＠coreboot.org 18 Nov '13

18 Nov '13

the following patch was just integrated into master: commit 7fda0e8e61682e66c956d3759a0ce39486dad747 Author: Ronald G. Minnich <rminnich(a)google.com> Date: Sun Nov 17 11:07:25 2013 -0800 cbfs: remove unused code and prototype The code is wrong (it's calling ntohl on an entry point that is actually already le due to an old cbfs bug) and nothing calls it any more anyway. Change-Id: Ief2c33faf99e3d2fc410524a5aae7bde378f088b Signed-off-by: Ronald G. Minnich <rminnich(a)google.com> Reviewed-on: http://review.coreboot.org/4090 Tested-by: build bot (Jenkins) Reviewed-by: Vladimir Serbinenko <phcoder(a)gmail.com> Reviewed-by: Aaron Durbin <adurbin(a)google.com> See http://review.coreboot.org/4090 for details. -gerrit

1 0

Patch set updated for coreboot: b6daa62 cbfs: 64-bit cleanups
by Ronald G. Minnich 18 Nov '13

18 Nov '13

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4037 -gerrit commit b6daa62acafb42b61d1a56eb3fbc7e9715b62fec Author: Ronald G. Minnich <rminnich(a)google.com> Date: Mon Nov 11 10:36:28 2013 -0800 cbfs: 64-bit cleanups cbfs used u32 in a number of cases where uintptr_t was correct. This change builds for both 64-bit and 32-bit boards. Change-Id: If42c722a8a9e8d565d3827f65ed6c2cb8e90ba60 Signed-off-by: Ronald G. Minnich <rminnich(a)google.com> --- src/lib/cbmem.c | 2 +- src/lib/selfboot.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c index de49816..6449b55 100644 --- a/src/lib/cbmem.c +++ b/src/lib/cbmem.c @@ -200,7 +200,7 @@ void *cbmem_add(u32 id, u64 size) cbmem_toc[0].base += size; cbmem_toc[0].size -= size; - return (void *)(u32)cbmem_toc[i].base; + return (void *)(uintptr_t)cbmem_toc[i].base; } void *cbmem_find(u32 id) diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index f69ad14..222eae2 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -305,7 +305,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) static int build_self_segment_list( struct segment *head, struct lb_memory *mem, - struct cbfs_payload *payload, u32 *entry) + struct cbfs_payload *payload, uintptr_t *entry) { struct segment *new; struct segment *ptr; @@ -332,8 +332,9 @@ static int build_self_segment_list( new->s_memsz = ntohl(segment->mem_len); new->compression = ntohl(segment->compression); - new->s_srcaddr = (u32) ((unsigned char *)first_segment) - + ntohl(segment->offset); + new->s_srcaddr = (uintptr_t) + ((unsigned char *)first_segment) + + ntohl(segment->offset); new->s_filesz = ntohl(segment->len); printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx srcaddr 0x%lx filesize 0x%lx\n", new->s_dstaddr, new->s_memsz, new->s_srcaddr, new->s_filesz); @@ -504,7 +505,7 @@ static int load_self_segments( void *selfload(struct lb_memory *mem, struct cbfs_payload *payload) { - u32 entry=0; + uintptr_t entry = 0; struct segment head; /* Preprocess the self segments */

1 0

Patch merged into coreboot/master: 72f15bd cbfstool: add a constant for the aarch64
by gerrit＠coreboot.org 18 Nov '13

18 Nov '13

the following patch was just integrated into master: commit 72f15bd2be37f5c28dae044aeec04aabb0db7326 Author: Ronald G. Minnich <rminnich(a)google.com> Date: Sun Nov 17 13:49:42 2013 -0800 cbfstool: add a constant for the aarch64 Change-Id: Ide2c8b778447de66d95bd8c55b378aa2051ac2a0 Signed-off-by: Ronald G. Minnich <rminnich(a)google.com> Reviewed-on: http://review.coreboot.org/4091 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)google.com> See http://review.coreboot.org/4091 for details. -gerrit

1 0

Patch merged into coreboot/master: e851a68 qemu: set smbios entries from fw_cfg
by gerrit＠coreboot.org 18 Nov '13

18 Nov '13

the following patch was just integrated into master: commit e851a685ef9d6280982465b319971e4252859227 Author: Gerd Hoffmann <kraxel(a)redhat.com> Date: Wed Nov 13 12:56:30 2013 +0100 qemu: set smbios entries from fw_cfg Qemu makes the guest uuid (qemu -uuid $uuid) available to the guest via fw_cfg. Other smbios fields can be configured in qemu using the -smbios command line switch (check the qemu manpage for details). This patch adds coreboot support for this, so the values provided by qemu will actually show up in the smbios table. Change-Id: Ifd9ae0d02749af4e7070a65eadbd1a9585a8a8e6 Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> Reviewed-on: http://review.coreboot.org/4086 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> See http://review.coreboot.org/4086 for details. -gerrit

1 0

Patch merged into coreboot/master: 0626274 smbios: make manufacturer, product_name and uuid runtime settable
by gerrit＠coreboot.org 18 Nov '13

18 Nov '13

the following patch was just integrated into master: commit 06262743c76102083287f5085380138164117bc7 Author: Gerd Hoffmann <kraxel(a)redhat.com> Date: Wed Nov 13 13:37:23 2013 +0100 smbios: make manufacturer, product_name and uuid runtime settable Make manufacturer, product_name and uuid smbios fields (type 1) configurable at runtime, simliar to version and serial number. Change-Id: Ibc826225e31fa42aa944fa43632dd6a406d5c85d Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> Reviewed-on: http://review.coreboot.org/4085 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See http://review.coreboot.org/4085 for details. -gerrit

1 0

Patch set updated for coreboot: 5761962 Add GRUB2 payload to build system
by Paul Menzel 18 Nov '13

18 Nov '13

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4058 -gerrit commit 57619628a7afc51539eb9747f0669aeaaeef5203 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Thu Nov 14 12:10:08 2013 +0100 Add GRUB2 payload to build system Since a long time GRUB 2 is a viable payload alternative to SeaBIOS and FILO. So make it easy for coreboot users to use GRUB 2 as a payload by integrating it into coreboot’s build system, so it can be selected in Kconfig. As the last GRUB 2 release 2.00 is too old and has several bugs when used as a coreboot payload only allow to build GRUB 2 master until a new GRUB release is done. The downside is, that accidental breakage in GRUB’s upstream does not affect coreboot users. Currently the GRUB 2 payload is built with the default modules which results in an uncompressed size of around 730 kB. Compressed it has a size of 340 kB, so it should be useable with 512 kB flash ROMs. Tested with QEMU. Change-Id: Ie75d5a2cb230390cd5a063d5f6a5d5e3fab6b354 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- .gitignore | 1 + payloads/external/GRUB2/Makefile.inc | 43 ++++++++++++++++++++++++++++++++++++ src/Kconfig | 26 +++++++++++++++++++++- src/arch/x86/Makefile.inc | 16 ++++++++++++++ 4 files changed, 85 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1cdabfc..da87fa2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ build/ coreboot-builds/ payloads/external/FILO/filo/ +payloads/external/GRUB2/grub2/ payloads/external/SeaBIOS/seabios/ util/crossgcc/acpica-unix-*/ util/crossgcc/binutils-*/ diff --git a/payloads/external/GRUB2/Makefile.inc b/payloads/external/GRUB2/Makefile.inc new file mode 100644 index 0000000..888151d --- /dev/null +++ b/payloads/external/GRUB2/Makefile.inc @@ -0,0 +1,43 @@ +TAG-$(CONFIG_GRUB2_MASTER)= +NAME-$(CONFIG_GRUB2_MASTER)=HEAD + +unexport KCONFIG_AUTOCONFIG + +all: grub2 + +checkout: + echo " GIT GRUB2 $(NAME-y)" + test -d grub2 || \ + git clone git://git.sv.gnu.org/grub.git grub2 + cd grub2 && \ + git checkout master && \ + git pull; \ + test -n "$(TAG-y)" && \ + git branch -f $(NAME-y) $(TAG-y) && \ + git checkout $(NAME-y) || true + +config: checkout + echo " CONFIG GRUB2 $(NAME-y)" + rm -rf grub2/build + mkdir grub2/build + cd grub2 && ./autogen.sh + cd grub2/build && ../configure BUILD_CC="$(HOSTCC)" CC="$(HOSTCC)" \ + TARGET_CC="$(CC)" \ + TARGET_OBJCOPY="$(OBJCOPY)" TARGET_STRIP="$(STRIP)" CFLAGS=-O2 TARGET_CFLAGS=-Os --with-platform=coreboot + +grub2: config + echo " MAKE GRUB2 $(NAME-y)" + $(MAKE) -C grub2/build BUILD_CC="$(HOSTCC)" CC="$(HOSTCC)" \ + TARGET_CC="$(CC)" TARGET_OBJCOPY="$(OBJCOPY)" \ + TARGET_STRIP="$(STRIP)" CFLAGS=-O2 TARGET_CFLAGS=-Os \ + && $(MAKE) -C grub2/build BUILD_CC="$(HOSTCC)" CC="$(HOSTCC)" \ + TARGET_CC="$(CC)" TARGET_OBJCOPY="$(OBJCOPY)" TARGET_STRIP="$(STRIP)" \ + CFLAGS=-O2 TARGET_CFLAGS=-Os default_payload.elf + +clean: + test -d grub2 && $(MAKE) -C grub2 clean || exit 0 + +distclean: + rm -rf grub2 + +.PHONY: checkout config grub2 clean distclean diff --git a/src/Kconfig b/src/Kconfig index 10f8c18..1c80b8c 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -569,6 +569,15 @@ config PAYLOAD_FILO See http://coreboot.org/Payloads for more information. +config PAYLOAD_GRUB2 + bool "GRUB2" + help + Select this option if you want to build a coreboot image + with a GRUB2 payload. If you don't know what this is + about, just leave it enabled. + + See http://coreboot.org/Payloads for more information. + config PAYLOAD_TIANOCORE bool "Tiano Core" help @@ -606,6 +615,17 @@ config SEABIOS_PS2_TIMEOUT keyboard controller to become ready before giving up. choice + prompt "GRUB2 version" + default GRUB2_MASTER + depends on PAYLOAD_GRUB2 + +config GRUB2_MASTER + bool "HEAD" + help + Newest GRUB2 version +endchoice + +choice prompt "FILO version" default FILO_STABLE depends on PAYLOAD_FILO @@ -643,6 +663,10 @@ config PAYLOAD_FILE default "payloads/external/FILO/filo/build/filo.elf" config PAYLOAD_FILE + depends on PAYLOAD_GRUB2 + default "payloads/external/GRUB2/grub2/build/default_payload.elf" + +config PAYLOAD_FILE string "Tianocore firmware volume" depends on PAYLOAD_TIANOCORE default "COREBOOT.fd" @@ -653,7 +677,7 @@ config PAYLOAD_FILE config COMPRESSED_PAYLOAD_LZMA bool "Use LZMA compression for payloads" default y - depends on PAYLOAD_ELF || PAYLOAD_SEABIOS || PAYLOAD_FILO || PAYLOAD_TIANOCORE + depends on PAYLOAD_ELF || PAYLOAD_SEABIOS || PAYLOAD_FILO || PAYLOAD_TIANOCORE || PAYLOAD_GRUB2 help In order to reduce the size payloads take up in the ROM chip coreboot can compress them using the LZMA algorithm. diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index dee56c5..b90bbe7 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -48,6 +48,9 @@ endif ifeq ($(CONFIG_PAYLOAD_FILO),y) COREBOOT_ROM_DEPENDENCIES+=filo endif +ifeq ($(CONFIG_PAYLOAD_GRUB2),y) +COREBOOT_ROM_DEPENDENCIES+=grub2 +endif extract_nth=$(word $(1), $(subst |, ,$(2))) @@ -113,6 +116,12 @@ ifeq ($(CONFIG_PAYLOAD_FILO),y) @printf " PAYLOAD FILO (internal, compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n" $(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG) endif + +ifeq ($(CONFIG_PAYLOAD_GRUB2),y) + @printf " PAYLOAD GRUB2 (internal, compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n" + $(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG) +endif + ifeq ($(CONFIG_PAYLOAD_TIANOCORE),y) @printf " PAYLOAD Tiano Core (compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n" $(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG) @@ -440,3 +449,10 @@ filo: CONFIG_FILO_MASTER=$(CONFIG_FILO_MASTER) \ CONFIG_FILO_STABLE=$(CONFIG_FILO_STABLE) + +grub2: + $(MAKE) -C payloads/external/GRUB2 -f Makefile.inc \ + HOSTCC="$(HOSTCC)" \ + CC="$(CC)" LD="$(LD)" OBJDUMP="$(OBJDUMP)" \ + OBJCOPY="$(OBJCOPY)" STRIP="$(STRIP)" \ + CONFIG_GRUB2_MASTER=$(CONFIG_GRUB2_MASTER)

1 0

New patch to review for coreboot: e011dce payloads/external/SeaBIOS/Makefile.inc: Remove empty lines at file beginning
by Paul Menzel 18 Nov '13

18 Nov '13

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4094 -gerrit commit e011dcee0cc90cd2c91720c628f80ee1e35d351f Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Mon Nov 18 11:20:30 2013 +0100 payloads/external/SeaBIOS/Makefile.inc: Remove empty lines at file beginning Change-Id: I3e6eba62b6790836edf9813c2a45c77390d8c078 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- payloads/external/SeaBIOS/Makefile.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc index 022e012..84f1515 100644 --- a/payloads/external/SeaBIOS/Makefile.inc +++ b/payloads/external/SeaBIOS/Makefile.inc @@ -1,5 +1,3 @@ - - TAG-$(CONFIG_SEABIOS_MASTER)=origin/master TAG-$(CONFIG_SEABIOS_STABLE)=88cb66ea542906ffff8a80ef397b9e3adbb33116

1 0

Patch set updated for coreboot: 9550431 Add GRUB2 payload to build system
by Paul Menzel 18 Nov '13

18 Nov '13

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4058 -gerrit commit 95504310a3b07b6fe065621f3a8e2baaddbd5bcf Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Thu Nov 14 12:10:08 2013 +0100 Add GRUB2 payload to build system Since a long time GRUB 2 is a viable payload alternative to SeaBIOS and FILO. So make it easy for coreboot users to use GRUB 2 as a payload by integrating it into coreboot’s build system, so it can be selected in Kconfig. As the last GRUB 2 release 2.00 is too old and has several bugs when used as a coreboot payload only allow to build GRUB 2 master until a new GRUB release is done. The downside is, that accidental breakage in GRUB’s upstream does not affect coreboot users. Currently the GRUB 2 payload is built with the default modules which results in an uncompressed size of around 730 kB. Compressed it has a size of 340 kB, so it should be useable with 512 kB flash ROMs. Tested with QEMU. Change-Id: Ie75d5a2cb230390cd5a063d5f6a5d5e3fab6b354 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- .gitignore | 1 + payloads/external/GRUB2/Makefile.inc | 43 ++++++++++++++++++++++++++++++++++++ src/Kconfig | 26 +++++++++++++++++++++- src/arch/x86/Makefile.inc | 16 ++++++++++++++ 4 files changed, 85 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1cdabfc..da87fa2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ build/ coreboot-builds/ payloads/external/FILO/filo/ +payloads/external/GRUB2/grub2/ payloads/external/SeaBIOS/seabios/ util/crossgcc/acpica-unix-*/ util/crossgcc/binutils-*/ diff --git a/payloads/external/GRUB2/Makefile.inc b/payloads/external/GRUB2/Makefile.inc new file mode 100644 index 0000000..888151d --- /dev/null +++ b/payloads/external/GRUB2/Makefile.inc @@ -0,0 +1,43 @@ +TAG-$(CONFIG_GRUB2_MASTER)= +NAME-$(CONFIG_GRUB2_MASTER)=HEAD + +unexport KCONFIG_AUTOCONFIG + +all: grub2 + +checkout: + echo " GIT GRUB2 $(NAME-y)" + test -d grub2 || \ + git clone git://git.sv.gnu.org/grub.git grub2 + cd grub2 && \ + git checkout master && \ + git pull; \ + test -n "$(TAG-y)" && \ + git branch -f $(NAME-y) $(TAG-y) && \ + git checkout $(NAME-y) || true + +config: checkout + echo " CONFIG GRUB2 $(NAME-y)" + rm -rf grub2/build + mkdir grub2/build + cd grub2 && ./autogen.sh + cd grub2/build && ../configure BUILD_CC="$(HOSTCC)" CC="$(HOSTCC)" \ + TARGET_CC="$(CC)" \ + TARGET_OBJCOPY="$(OBJCOPY)" TARGET_STRIP="$(STRIP)" CFLAGS=-O2 TARGET_CFLAGS=-Os --with-platform=coreboot + +grub2: config + echo " MAKE GRUB2 $(NAME-y)" + $(MAKE) -C grub2/build BUILD_CC="$(HOSTCC)" CC="$(HOSTCC)" \ + TARGET_CC="$(CC)" TARGET_OBJCOPY="$(OBJCOPY)" \ + TARGET_STRIP="$(STRIP)" CFLAGS=-O2 TARGET_CFLAGS=-Os \ + && $(MAKE) -C grub2/build BUILD_CC="$(HOSTCC)" CC="$(HOSTCC)" \ + TARGET_CC="$(CC)" TARGET_OBJCOPY="$(OBJCOPY)" TARGET_STRIP="$(STRIP)" \ + CFLAGS=-O2 TARGET_CFLAGS=-Os default_payload.elf + +clean: + test -d grub2 && $(MAKE) -C grub2 clean || exit 0 + +distclean: + rm -rf grub2 + +.PHONY: checkout config grub2 clean distclean diff --git a/src/Kconfig b/src/Kconfig index 10f8c18..1c80b8c 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -569,6 +569,15 @@ config PAYLOAD_FILO See http://coreboot.org/Payloads for more information. +config PAYLOAD_GRUB2 + bool "GRUB2" + help + Select this option if you want to build a coreboot image + with a GRUB2 payload. If you don't know what this is + about, just leave it enabled. + + See http://coreboot.org/Payloads for more information. + config PAYLOAD_TIANOCORE bool "Tiano Core" help @@ -606,6 +615,17 @@ config SEABIOS_PS2_TIMEOUT keyboard controller to become ready before giving up. choice + prompt "GRUB2 version" + default GRUB2_MASTER + depends on PAYLOAD_GRUB2 + +config GRUB2_MASTER + bool "HEAD" + help + Newest GRUB2 version +endchoice + +choice prompt "FILO version" default FILO_STABLE depends on PAYLOAD_FILO @@ -643,6 +663,10 @@ config PAYLOAD_FILE default "payloads/external/FILO/filo/build/filo.elf" config PAYLOAD_FILE + depends on PAYLOAD_GRUB2 + default "payloads/external/GRUB2/grub2/build/default_payload.elf" + +config PAYLOAD_FILE string "Tianocore firmware volume" depends on PAYLOAD_TIANOCORE default "COREBOOT.fd" @@ -653,7 +677,7 @@ config PAYLOAD_FILE config COMPRESSED_PAYLOAD_LZMA bool "Use LZMA compression for payloads" default y - depends on PAYLOAD_ELF || PAYLOAD_SEABIOS || PAYLOAD_FILO || PAYLOAD_TIANOCORE + depends on PAYLOAD_ELF || PAYLOAD_SEABIOS || PAYLOAD_FILO || PAYLOAD_TIANOCORE || PAYLOAD_GRUB2 help In order to reduce the size payloads take up in the ROM chip coreboot can compress them using the LZMA algorithm. diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index dee56c5..b90bbe7 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -48,6 +48,9 @@ endif ifeq ($(CONFIG_PAYLOAD_FILO),y) COREBOOT_ROM_DEPENDENCIES+=filo endif +ifeq ($(CONFIG_PAYLOAD_GRUB2),y) +COREBOOT_ROM_DEPENDENCIES+=grub2 +endif extract_nth=$(word $(1), $(subst |, ,$(2))) @@ -113,6 +116,12 @@ ifeq ($(CONFIG_PAYLOAD_FILO),y) @printf " PAYLOAD FILO (internal, compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n" $(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG) endif + +ifeq ($(CONFIG_PAYLOAD_GRUB2),y) + @printf " PAYLOAD GRUB2 (internal, compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n" + $(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG) +endif + ifeq ($(CONFIG_PAYLOAD_TIANOCORE),y) @printf " PAYLOAD Tiano Core (compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n" $(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG) @@ -440,3 +449,10 @@ filo: CONFIG_FILO_MASTER=$(CONFIG_FILO_MASTER) \ CONFIG_FILO_STABLE=$(CONFIG_FILO_STABLE) + +grub2: + $(MAKE) -C payloads/external/GRUB2 -f Makefile.inc \ + HOSTCC="$(HOSTCC)" \ + CC="$(CC)" LD="$(LD)" OBJDUMP="$(OBJDUMP)" \ + OBJCOPY="$(OBJCOPY)" STRIP="$(STRIP)" \ + CONFIG_GRUB2_MASTER=$(CONFIG_GRUB2_MASTER)

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
86
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit November 2013