Denis Carikli (GNUtoo@no-log.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5109
-gerrit
commit ff60d219a77a80abcb73c00d4e994343ef08cc57 Author: Denis 'GNUtoo' Carikli GNUtoo@no-log.org Date: Mon Feb 3 23:09:30 2014 +0100
Add grub.cfg
Change-Id: I5480d6a5f2a6bbae4222e05bbe92eb717e1aff65 Signed-off-by: Denis 'GNUtoo' Carikli GNUtoo@no-log.org --- src/Kconfig | 15 +++++++++++++++ src/arch/x86/Makefile.inc | 6 ++++++ 2 files changed, 21 insertions(+)
diff --git a/src/Kconfig b/src/Kconfig index 31a41ab..d866e6f 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -695,6 +695,21 @@ config PAYLOAD_FILE help The result of a corebootPkg build
+config INCLUDE_GRUB2_CONFIG_FILE + bool "Include the GRUB2 grub.cfg file into the ROM image" + depends on PAYLOAD_GRUB2 + default n + help + Include the GRUB2 grub.cfg configuration file. + This configuration may need to be coreboot specific. + +config GRUB2_CONFIG_FILE + string "Path and filename to grub.cfg" + depends on INCLUDE_GRUB2_CONFIG_FILE + default "grub.cfg" + help + The path and filename to the file to be added to cbfs. + # TODO: Defined if no payload? Breaks build? config COMPRESSED_PAYLOAD_LZMA bool "Use LZMA compression for payloads" diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 80e731f..ab1b037 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -126,6 +126,12 @@ ifeq ($(CONFIG_PAYLOAD_TIANOCORE),y) @printf " PAYLOAD Tiano Core (compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n" $(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG) endif + +ifeq ($(CONFIG_INCLUDE_GRUB2_CONFIG_FILE),y) + @printf " CONFIG $(CONFIG_CBFS_PREFIX)/grub.cfg\n" + $(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_GRUB2_CONFIG_FILE) -n $(CONFIG_CBFS_PREFIX)/grub.cfg -t raw +endif + ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y) @printf " CONFIG $(DOTCONFIG)\n" if [ -f $(DOTCONFIG) ]; then \