[coreboot-gerrit] Patch set updated for coreboot: payloads/external/GRUB2: Pass CONFIG_GRUB2_EXTRA_MODULES

[Benjamin Barenblat (bbaren@google.com)]

Benjamin Barenblat (bbaren at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15203

-gerrit

commit 203d804fd22a4d54bbfa6ac3eafb904b7753848e
Author: Benjamin Barenblat <bbaren at google.com>
Date:   Wed Jun 15 12:08:06 2016 -0700

    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 at google.com>
---
 payloads/external/GRUB2/Makefile | 3 ++-
 payloads/external/Makefile.inc   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/payloads/external/GRUB2/Makefile b/payloads/external/GRUB2/Makefile
index 5d53922..c257f0e 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 f070bb4..d61fed6 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