summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2016-06-05 10:30:34 -0600
committerMartin Roth <martinroth@google.com>2016-06-08 19:17:04 +0200
commitbc46ac5c7d78e9bf552482382a168a509c7537d9 (patch)
tree351c7e97f23b070e171e6e894f2f3f111f965961
parentb14693193cb850161fa9ba24cca1c8592005453c (diff)
downloadcoreboot-bc46ac5c7d78e9bf552482382a168a509c7537d9.tar.xz
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@google.com> Reviewed-on: https://review.coreboot.org/15076 Tested-by: build bot (Jenkins) Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
-rw-r--r--payloads/external/Makefile.inc7
-rw-r--r--payloads/external/SeaBIOS/Kconfig16
2 files changed, 23 insertions, 0 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 65b3dd2fb4..f070bb486c 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 94aac8f46f..abfd291330 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"