[coreboot-gerrit] Patch set updated for coreboot: payloads/GRUB2: Add Kconfig option for grub.cfg

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/5109

-gerrit

commit 3a1c1b30c19def52c32f328006be24fb60c8d9ce
Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date:   Mon Feb 3 23:09:30 2014 +0100

    payloads/GRUB2: Add Kconfig option for grub.cfg
    
    Change-Id: I5480d6a5f2a6bbae4222e05bbe92eb717e1aff65
    Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
    Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>
---
 payloads/external/GRUB2/Kconfig | 23 +++++++++++++++++++++++
 payloads/external/Makefile.inc  |  4 ++++
 2 files changed, 27 insertions(+)

diff --git a/payloads/external/GRUB2/Kconfig b/payloads/external/GRUB2/Kconfig
index 04f0fa9..b7d5385 100644
--- a/payloads/external/GRUB2/Kconfig
+++ b/payloads/external/GRUB2/Kconfig
@@ -24,4 +24,27 @@ config GRUB2_EXTRA_MODULES
 config PAYLOAD_FILE
 	default "payloads/external/GRUB2/grub2/build/default_payload.elf"
 
+config GRUB2_INCLUDE_RUNTIME_CONFIG_FILE
+	bool "Include GRUB2 runtime config file into ROM image"
+	depends on PAYLOAD_GRUB2
+	default n
+	help
+	  The GRUB2 payload reads the runtime configuration file from the image
+	  stored on the flash ROM chip. Without that, it’ll just drop into a
+	  rescue shell.
+
+	  This configuration may need to be coreboot specific.
+
+	  Select this option, if you want to include the GRUB2 runtime
+	  configuration file into the image as `etc/grub.cfg`.
+
+	  You can add this file manually too.
+
+config GRUB2_RUNTIME_CONFIG_FILE
+	string "Path of grub.cfg"
+	depends on GRUB2_INCLUDE_RUNTIME_CONFIG_FILE
+	default "grub.cfg"
+	help
+	  The path of the GRUB2 runtime configuration file to be added to CBFS.
+
 endif
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 26a5613..3e5713c 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -50,6 +50,10 @@ cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += payload_revision
 payload_revision-file := $(PAYLOAD_VERSION)
 payload_revision-type := raw
 
+cbfs-files-$(CONFIG_GRUB2_INCLUDE_RUNTIME_CONFIG_FILE) += etc/grub.cfg
+etc/grub.cfg-file := $(CONFIG_GRUB2_RUNTIME_CONFIG_FILE)
+etc/grub.cfg-type := raw
+
 SEABIOS_CC_OFFSET=$(if $(filter %ccache,$(HOSTCC)),2,1)
 payloads/external/SeaBIOS/seabios/out/bios.bin.elf seabios: $(top)/$(DOTCONFIG)
 	$(MAKE) -C payloads/external/SeaBIOS \