[coreboot-gerrit] Patch set updated for coreboot: [NOTFORMERGE] payloads: Set default to GRUB2 and add grub.cfg

[Paul Menzel (paulepanter@users.sourceforge.net)]

Paul Menzel (paulepanter at users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14013

-gerrit

commit bb5905e7f4cc8d31d6d07692fc9bfe30dcf46514
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date:   Wed Mar 9 20:00:37 2016 +0100

    [NOTFORMERGE] payloads: Set default to GRUB2 and add grub.cfg
    
    This is just for build testing.
    
    Change-Id: I74eb389442412bbe6336f3c637b23fd127a2e98a
    Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>
---
 grub.cfg                        | 1 +
 payloads/Kconfig                | 2 +-
 payloads/external/GRUB2/Kconfig | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/grub.cfg b/grub.cfg
new file mode 100644
index 0000000..9daeafb
--- /dev/null
+++ b/grub.cfg
@@ -0,0 +1 @@
+test
diff --git a/payloads/Kconfig b/payloads/Kconfig
index c7b9e2a..40559aa 100644
--- a/payloads/Kconfig
+++ b/payloads/Kconfig
@@ -3,7 +3,7 @@ menu "Payload"
 choice
 	prompt "Add a payload"
 	default PAYLOAD_NONE if !ARCH_X86
-	default PAYLOAD_SEABIOS if ARCH_X86
+	default PAYLOAD_GRUB2 if ARCH_X86
 
 config PAYLOAD_NONE
 	bool "None"
diff --git a/payloads/external/GRUB2/Kconfig b/payloads/external/GRUB2/Kconfig
index 7a4562c..cf533c5 100644
--- a/payloads/external/GRUB2/Kconfig
+++ b/payloads/external/GRUB2/Kconfig
@@ -27,7 +27,7 @@ config PAYLOAD_FILE
 config GRUB2_INCLUDE_RUNTIME_CONFIG_FILE
 	bool "Include GRUB2 runtime config file into ROM image"
 	depends on PAYLOAD_GRUB2
-	default n
+	default y
 	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