[coreboot-gerrit] Patch set updated for coreboot: SeaBIOS: Add option to include a bootorder file in cbfs

[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/15076

-gerrit

commit 1db0dc7ea0179660291e6c5ded65fb4a9a83fcbb
Author: Martin Roth <martinroth at google.com>
Date:   Sun Jun 5 10:30:34 2016 -0600

    SeaBIOS: Add option to include a bootorder file in cbfs
    
    Including the SeaBIOS bootorder file seems to be a fairly common desire,
    so let's make it easy.
    
    Change-Id: Ib0874dee46215287b09c0b52648072ef3ff06ec5
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 payloads/external/Makefile.inc    |  7 +++++++
 payloads/external/SeaBIOS/Kconfig | 16 ++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 65b3dd2..f070bb4 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -85,6 +85,13 @@ payloads/external/SeaBIOS/seabios/out/vgabios.bin: seabios
 payloads/external/SeaBIOS/seabios/.config: payloads/external/SeaBIOS/seabios/out/bios.bin.elf
 payloads/external/SeaBIOS/seabios/out/autoversion.h: payloads/external/SeaBIOS/seabios/out/bios.bin.elf
 
+# add a SeaBIOS bootorder file
+ifneq ($(strip $(CONFIG_SEABIOS_BOOTORDER_FILE)),)
+cbfs-files-y += bootorder
+bootorder-file := $(strip $(CONFIG_SEABIOS_BOOTORDER_FILE))
+bootorder-type := raw
+endif
+
 payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(top)/$(DOTCONFIG) $(CBFSTOOL)
 	$(MAKE) -C payloads/external/depthcharge \
 		BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) \
diff --git a/payloads/external/SeaBIOS/Kconfig b/payloads/external/SeaBIOS/Kconfig
index 94aac8f..abfd291 100644
--- a/payloads/external/SeaBIOS/Kconfig
+++ b/payloads/external/SeaBIOS/Kconfig
@@ -70,6 +70,22 @@ config PAYLOAD_CONFIGFILE
 	  SeaBIOS payload.  In general, if the option is used, the default
 	  would be "$(top)/src/mainboard/$(MAINBOARDDIR)/config_seabios"
 
+config SEABIOS_BOOTORDER_FILE
+	string "SeaBIOS bootorder file"
+	default ""
+	help
+	  Add a SeaBIOS bootorder file.  From the wiki:
+	  "The bootorder file may be used to configure the boot up order. The file
+	  should be ASCII text and contain one line per boot method. The description
+	  of each boot method follows an Open Firmware device path format. SeaBIOS
+	  will attempt to boot from each item in the file - first line of the file
+	  first."
+
+	  See: https://www.coreboot.org/SeaBIOS#Configuring_boot_order
+
+	  If used, a typical value would be:
+	    $(top)/src/mainboard/$(MAINBOARDDIR)/bootorder
+
 config PAYLOAD_FILE
 	default "payloads/external/SeaBIOS/seabios/out/bios.bin.elf"