Denis Carikli (GNUtoo(a)no-log.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/5109
-gerrit
commit fa9ae74ad7893fe5438215b32d5850c6fcc880b3
Author: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org>
Date: Mon Feb 3 23:09:30 2014 +0100
payloads/GRUB2: Add Kconfig option for grub.cfg
Change-Id: I5480d6a5f2a6bbae4222e05bbe92eb717e1aff65
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org>
Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
---
payloads/external/GRUB2/Kconfig | 23 +++++++++++++++++++++++
payloads/external/Makefile.inc | 4 ++++
2 files changed, 27 insertions(+)
diff --git a/payloads/external/GRUB2/Kconfig b/payloads/external/GRUB2/Kconfig
index 04f0fa9..b7d5385 100644
--- a/payloads/external/GRUB2/Kconfig
+++ b/payloads/external/GRUB2/Kconfig
@@ -24,4 +24,27 @@ 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 the runtime configuration file from the image
+ stored 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 the image as `etc/grub.cfg`.
+
+ You can add this file manually too.
+
+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 557de2a..a26762a 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -34,6 +34,10 @@ cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += payload_revision
payload_revision-file := $(PAYLOAD_VERSION)
payload_revision-type := raw
+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)
seabios:
$(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc \
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14410
-gerrit
commit 0d46f4b9de615fb750a6b81b117d89d5efec0372
Author: Martin Roth <martinroth(a)google.com>
Date: Mon Apr 18 20:30:53 2016 -0600
util/abuild/abuild: Fix a few abuild errors
This file needs to be updated, but this should fix a few errors
that we just saw:
util/abuild/abuild: line 655: [:
/home/coreboot/slave-root/workspace/coreboot-gerrit/
src/mainboard/google/link: binary operator expected
grep: kontron/come-bip2/Kconfig: No such file or directory
util/abuild/abuild: line 313: [: /home/coreboot/slave-root/
workspace/coreboot-gerrit/src/mainboard/google/link:0:
integer expression expected
util/abuild/abuild: line 318: [: src/mainboard/google/link:
binary operator expected
Change-Id: I0dbd9fa26e6250afe24800835ada236a0ee73e0a
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
util/abuild/abuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/util/abuild/abuild b/util/abuild/abuild
index a2a428b..817ee5e 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -310,12 +310,12 @@ function build_target
HOSTCC='gcc'
- if [ $chromeos = true -a `grep -c "^[[:space:]]*select[[:space:]]*MAINBOARD_HAS_CHROMEOS\>" ${ROOT}/src/mainboard/${board_srcdir}/Kconfig` -eq 0 ]; then
+ if [ -z "$(grep "^[[:space:]]*select[[:space:]]*MAINBOARD_HAS_CHROMEOS\>" ${ROOT}/src/mainboard/${board_srcdir}/Kconfig)" ]; then
echo "${MAINBOARD} doesn't support Chrome OS, skipping."
return
fi
- if [ -f src/mainboard/${board_srcdir}/abuild.disabled ]; then
+ if [ -f "src/mainboard/${board_srcdir}/abuild.disabled" ]; then
echo "${MAINBOARD} disabled:"
cat src/mainboard/${board_srcdir}/abuild.disabled
return
@@ -652,7 +652,7 @@ if [ "$target" != "" ]; then
build_srcdir=$(mainboard_directory ${MAINBOARD})
if [ "$(echo ${MAINBOARD} | wc -w)" -gt 1 ]; then
build_targets ${MAINBOARD}
- elif [ ! -r $ROOT/src/mainboard/${build_srcdir} ]; then
+ elif [ ! -r "$ROOT/src/mainboard/${build_srcdir}" ]; then
printf "No such target: ${MAINBOARD}\n"
exit 1
else