summaryrefslogtreecommitdiff
path: root/payloads
diff options
context:
space:
mode:
authorBenjamin Barenblat <bbaren@google.com>2016-06-15 12:08:06 -0700
committerMartin Roth <martinroth@google.com>2016-06-21 18:42:08 +0200
commit9993286de2f47b24b91ed48615aefc23140f855b (patch)
tree85aec70069a918814927272ca06f58287b2a4807 /payloads
parent2c68b1c732f5e7546447f03dd298cbba90b8f13a (diff)
downloadcoreboot-9993286de2f47b24b91ed48615aefc23140f855b.tar.xz
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>
Diffstat (limited to 'payloads')
-rw-r--r--payloads/external/GRUB2/Makefile3
-rw-r--r--payloads/external/Makefile.inc3
2 files changed, 4 insertions, 2 deletions
diff --git a/payloads/external/GRUB2/Makefile b/payloads/external/GRUB2/Makefile
index 5d53922a33..c257f0e954 100644
--- a/payloads/external/GRUB2/Makefile
+++ b/payloads/external/GRUB2/Makefile
@@ -45,7 +45,8 @@ config: checkout
grub2: config
echo " MAKE GRUB2 $(NAME-y)"
$(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:
test -d grub2 && $(MAKE) -C grub2 clean || exit 0
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index f070bb486c..d61fed63d7 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -114,7 +114,8 @@ grub2:
HOSTCC="$(HOSTCC)" \
CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_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