the following patch was just integrated into master:
commit 16f64af25cc2b79975698598ab57a40ff8110d15
Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
Date: Fri Jan 31 20:32:54 2014 +0200
AMD cimx/sb800: Set SPI frequency and prefetch
Broken with/since commit d1cb0eec.
Original intention was to set the frequency for 'Fast Read' command
in bits 15..14, and enable 'Fast Read' command.
Modified register contains SPI frequency for 'Normal Read' command
in bits 13..12. Default for this is 11b for 16.5 MHz. Existing code
unintentionally clears these bits, increasing SPI frequency to 66MHz
for 'Normal Read' command.
This is above specifications for many common SPI flash components
and also makes flashrom older than 0.9.7-r1750 to operate unreliably
on read/write/erase for these platforms.
Change-Id: I30109e2a0410c0bb0bdc968ea71787396b32e761
Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
See http://review.coreboot.org/5089 for details.
-gerrit
Denis Carikli (GNUtoo(a)no-log.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5111
-gerrit
commit aa8f23208752db732beaea9d45c02be741270762
Author: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org>
Date: Tue Feb 4 00:07:02 2014 +0100
WIP: add grub2 more stable rc2
TODO: make it work.
the $(TAG-y) in test -n "$(TAG-y)" is empty.
that doesn't print and result in "git checkout"
which ends up on master
Change-Id: Ic3ae93f8e3cb814810682b0c779b56f15ae3a78c
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org>
---
payloads/external/GRUB2/Makefile.inc | 3 +++
src/Kconfig | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/payloads/external/GRUB2/Makefile.inc b/payloads/external/GRUB2/Makefile.inc
index 4b08e7d..3cc2bfe 100644
--- a/payloads/external/GRUB2/Makefile.inc
+++ b/payloads/external/GRUB2/Makefile.inc
@@ -1,3 +1,6 @@
+TAG-$(CONFIG_GRUB2_STABLE)=e8f07821cce1bd0ab6d5622c2a42440f15f4fd71
+NAME-$(CONFIG_GRUB2_STABLE)=$(GRUB2_STABLE)
+
TAG-$(CONFIG_GRUB2_MASTER)=
NAME-$(CONFIG_GRUB2_MASTER)=HEAD
diff --git a/src/Kconfig b/src/Kconfig
index d866e6f..3b31d90 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -641,6 +641,11 @@ choice
default GRUB2_MASTER
depends on PAYLOAD_GRUB2
+config GRUB2_STABLE
+ bool "grub-2.02-beta2"
+ help
+ Stable GRUB2 version
+
config GRUB2_MASTER
bool "HEAD"
help
Denis Carikli (GNUtoo(a)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(a)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(a)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 \