GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

payloads/external/GRUB2: Pass CONFIG_GRUB2_EXTRA_MODULES 

Set CONFIG_GRUB2_EXTRA_MODULES from the Kconfig when building GRUB2.
This causes the specified modules to actually enter the built payload.

Change-Id: I345026af705ba8af77c6c12aba8e1bd4135e519c
Signed-off-by: Benjamin Barenblat <bbaren@google.com>
Reviewed-on: https://review.coreboot.org/15203
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>
This commit is contained in:
Benjamin Barenblat 2016-06-15 12:08:06 -07:00 committed by Martin Roth
parent 2c68b1c732
commit 9993286de2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
payloads/external/GRUB2/Makefile vendored
View File

@ -45,7 +45,8 @@ config: checkout
grub2: config grub2: config
echo " MAKE GRUB2 $(NAME-y)" echo " MAKE GRUB2 $(NAME-y)"
$(MAKE) -C grub2/build CC="$(HOSTCC)" $(MAKE) -C grub2/build CC="$(HOSTCC)"
$(MAKE) -C grub2/build default_payload.elf EXTRA_PAYLOAD_MODULES="$(GRUB2_EXTRA_MODULES)" $(MAKE) -C grub2/build default_payload.elf \
EXTRA_PAYLOAD_MODULES="$(CONFIG_GRUB2_EXTRA_MODULES)"
clean: clean:
test -d grub2 && $(MAKE) -C grub2 clean || exit 0 test -d grub2 && $(MAKE) -C grub2 clean || exit 0

3
payloads/external/Makefile.inc vendored
View File

@ -114,7 +114,8 @@ grub2:
HOSTCC="$(HOSTCC)" \ HOSTCC="$(HOSTCC)" \
CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \ CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \
OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \ OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \
CONFIG_GRUB2_MASTER=$(CONFIG_GRUB2_MASTER) CONFIG_GRUB2_MASTER=$(CONFIG_GRUB2_MASTER) \
CONFIG_GRUB2_EXTRA_MODULES=$(CONFIG_GRUB2_EXTRA_MODULES)
payloads/external/GRUB2/grub2/build/default_payload.elf: grub2 payloads/external/GRUB2/grub2/build/default_payload.elf: grub2