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

[Stefan Tauner (stefan.tauner@gmx.at)]

Stefan Tauner (stefan.tauner at gmx.at) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/5109

-gerrit

commit 11fd315f3b402a1bca01a106f80a3773f185ddf8
Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date:   Sun Jan 8 06:43:01 2017 +0100

    payloads/GRUB2: Add Kconfig options 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>
    Signed-off-by: Martin Roth <martinroth at google.com>
    Signed-off-by: Stefan Tauner <stefan.tauner at gmx.at>
---
 payloads/external/GRUB2/Kconfig | 26 ++++++++++++++++++++++++++
 payloads/external/Makefile.inc  |  3 +++
 2 files changed, 29 insertions(+)

diff --git a/payloads/external/GRUB2/Kconfig b/payloads/external/GRUB2/Kconfig
index 04f0fa9..c9f07d5 100644
--- a/payloads/external/GRUB2/Kconfig
+++ b/payloads/external/GRUB2/Kconfig
@@ -24,4 +24,30 @@ 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 its runtime configuration file from etc/grub.cfg
+	  stored in the CBFS 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 CBFS as `etc/grub.cfg` automatically.
+
+	  You will be able to specify the path of the configuration file later.
+
+	  Without this option you would need to add this file manually with
+	  build/cbfstool build/coreboot.rom add -f grub.cfg -n etc/grub.cfg -t raw
+
+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 e4d3e12..9304bb9 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -61,6 +61,9 @@ payload_revision-file := $(PAYLOAD_VERSION)
 payload_revision-type := raw
 
 # SeaBIOS
+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: $(DOTCONFIG)