Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4772
-gerrit
commit 4b7941332829cc3fddbfba3b939ee75e4930cf05
Author: Aaron Durbin <adurbin(a)chromium.org>
Date: Tue Jan 21 15:28:38 2014 -0600
cbfstool: correct size left calculation for "empty" entries
After removing a file sandwiched between two other files, that file
could no longer be re-added at the same location. cbfstool tried to
add the file, and a new "empty" entry, which, together, would no
longer fit, so it continued checking for the next available space.
Change the behavior to add the file if there is enough space for the
file alone, then only add the "empty" entry if there is enough space
for it.
Change-Id: Iad3897dd28cf12f12ae877cfd83e1990fa7d2f0f
Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
Signed-off-by: Aaron Durbin <adurbin(a)chromium.org>
---
util/cbfstool/cbfs_image.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c
index eb9d574..401654e 100644
--- a/util/cbfstool/cbfs_image.c
+++ b/util/cbfstool/cbfs_image.c
@@ -380,6 +380,10 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer,
DEBUG("cbfs_add_entry: space at 0x%x+0x%x(%d) bytes\n",
addr, addr_next - addr, addr_next - addr);
+
+ /* Will the file fit? Don't yet worry if we have space for a new
+ * "empty" entry. We take care of that later.
+ */
if (addr + need_size > addr_next)
continue;
@@ -399,6 +403,16 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer,
entry = cbfs_find_next_entry(image, entry);
new_size = (cbfs_get_entry_addr(image, next) -
cbfs_get_entry_addr(image, entry));
+
+ /* Entry was added and no space for new "empty" entry */
+ if (new_size < cbfs_calculate_file_header_size("")) {
+ DEBUG("No need for new \"empty\" entry\n");
+ /* No need to increase the size of the just
+ * stored file to extend to next file. Alignment
+ * of next file takes care of this.
+ */
+ return 0;
+ }
new_size -= cbfs_calculate_file_header_size("");
DEBUG("new size: %d\n", new_size);
cbfs_create_empty_entry(image, entry, new_size, "");
Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4772
-gerrit
commit 58a0f92978ec6e1e418211c6137cb31311932a7c
Author: Aaron Durbin <adurbin(a)chromium.org>
Date: Tue Jan 21 15:28:38 2014 -0600
cbfstool: correct size left calculation for "empty" entries
After removing a file sandwiched between two other files, that file
could no longer be re-added at the same location. cbfstool tried to
add the file, and a new "empty" entry, which, together, would no
longer fit, so it continued checking for the next available space.
Change the behavior to add the file if there is enough space for the
file alone, then only add the "empty" entry if there is enough space
for it.
Change-Id: Iad3897dd28cf12f12ae877cfd83e1990fa7d2f0f
Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
Signed-off-by: Aaron Durbin <adurbin(a)chromium.org>
---
util/cbfstool/cbfs_image.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c
index eb9d574..dc24267 100644
--- a/util/cbfstool/cbfs_image.c
+++ b/util/cbfstool/cbfs_image.c
@@ -380,6 +380,10 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer,
DEBUG("cbfs_add_entry: space at 0x%x+0x%x(%d) bytes\n",
addr, addr_next - addr, addr_next - addr);
+
+ /* Will the file fit? Don't yet worry if we have space for a new
+ * "empty" entry. We take care of that later.
+ */
if (addr + need_size > addr_next)
continue;
@@ -399,6 +403,15 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer,
entry = cbfs_find_next_entry(image, entry);
new_size = (cbfs_get_entry_addr(image, next) -
cbfs_get_entry_addr(image, entry));
+
+ /* Entry was added and no space for new "empty" entry */
+ if (new_size < cbfs_calculate_file_header_size("")) {
+ DEBUG("No space for new empty entry.\n");
+ /* FIXME: Do we need to increase the size of the
+ * just stored file to extend to next file?
+ */
+ return 0;
+ }
new_size -= cbfs_calculate_file_header_size("");
DEBUG("new size: %d\n", new_size);
cbfs_create_empty_entry(image, entry, new_size, "");
Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4763
-gerrit
commit 3b9c81573ec5a3ae7fa100833ef807548db2cd32
Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
Date: Mon Jan 20 18:04:14 2014 -0600
nb/sandybridge: Move MRC cache above mrc.bin
This small change greatly reduces CBFS fragmentation. There is now a
small gap of only 728 bytes between mrc.bin and mrc.cache, with the
64 KiB alignment maintained for mrc.cache -- assuming systemagent-r6
is used. The gap was just under 64 KiB before.
With this change, it is easier to accommodate fallback and normal
boot stages without having to manually place the stages in the highly
fragmented CBFS.
Change-Id: Ia2340c1928ed6e232949e053d1943c2f5737f741
Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
---
src/northbridge/intel/sandybridge/Makefile.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/northbridge/intel/sandybridge/Makefile.inc b/src/northbridge/intel/sandybridge/Makefile.inc
index 37d392f..cef52b2 100644
--- a/src/northbridge/intel/sandybridge/Makefile.inc
+++ b/src/northbridge/intel/sandybridge/Makefile.inc
@@ -47,7 +47,7 @@ $(obj)/mrc.cache:
cbfs-files-$(CONFIG_HAVE_MRC_CACHE) += mrc.cache
mrc.cache-file := $(obj)/mrc.cache
-mrc.cache-position := 0xfff80000
+mrc.cache-position := 0xfffd0000
mrc.cache-type := 0xac
$(obj)/northbridge/intel/sandybridge/acpi.ramstage.o : $(obj)/build.h
the following patch was just integrated into master:
commit b8065ea6966c554e05725e46aaf692f0a459f535
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Thu Jan 23 20:37:22 2014 +0100
intel/microcode: Remove leftover MICROCODE_INCLUDE_PATH.
Not used anymore since microcode was moved.
Change-Id: Id666c80cb20e90e3664c4dcfcc0c41a4aeb4864c
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
See http://review.coreboot.org/4788 for details.
-gerrit
the following patch was just integrated into master:
commit ecd202d4dbc3ef88b42c063a2d70e92e5f3dd22a
Author: Andrew Wu <arw(a)dmp.com.tw>
Date: Thu Sep 5 00:21:11 2013 +0800
Makefile: Check $CC variable returned from xcompile is not empty.
If xcompile can't find out suitable GCC compiler for i386/armv7, it
will not set $CC_i386/$CC_armv7 variable. Makefile sets $CC variable
from xcompile, and will print strange error messages when executing
$CC program if $CC is empty.
Add checking to avoid this problem. If $CC is empty, also delete
invalid .xcompile file, so Make can recreate this file next time.
Change-Id: Ia8d481d76ca52f3351cb99f05779d06947161c5d
Signed-off-by: Andrew Wu <arw(a)dmp.com.tw>
See http://review.coreboot.org/3905 for details.
-gerrit
the following patch was just integrated into master:
commit cc05e9b31cbd707a3aa7a9f27f6bba585fb238ff
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Sat Jan 4 21:00:38 2014 +0100
sandy/ivy SPI: Support hardware sequencing and use with multiple chips
When 2 chips are present to get to the second one you have to use hardware
sequencing. Also use it as the fallback if chip is unknown.
Based on code in flashrom by Stefan Tauner and Carl-Daniel Hailfinger
distributed under compatible license.
Tested on Lenovo X230 which has EN25QH64 (8M) + N25Q032..3E (4M)
Change-Id: I56f3cf0406b5f09fa327ed052c8e8b1df1d8a11f
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
See http://review.coreboot.org/4613 for details.
-gerrit
the following patch was just integrated into master:
commit af225e5649b0fdba1ffa473afaf730c52fd74272
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Sat Jan 18 17:45:32 2014 +0100
SPI: Add API for programmer-specific flashing.
Change-Id: I7a2f5b9ae74458b5ed6271b1c27842c61546dcd2
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
See http://review.coreboot.org/4712 for details.
-gerrit
the following patch was just integrated into master:
commit a51b77677391d3c0bd574b96ca9937d9dd59e580
Author: Andrew Wu <arw(a)dmp.com.tw>
Date: Wed Oct 23 20:47:20 2013 +0800
keyboard.c: fix coding style with indent
Change-Id: Ie8efa9fb9bdc65bf8015eec197f44c432e87d907
Signed-off-by: Andrew Wu <arw(a)dmp.com.tw>
See http://review.coreboot.org/3986 for details.
-gerrit
the following patch was just integrated into master:
commit f2582d01f7338c2c4da655e38d5cd58d123f07b5
Author: Andrew Wu <arw(a)dmp.com.tw>
Date: Mon Dec 23 19:54:26 2013 +0800
dmp/vortex86ex: Initialize I2C controller base address/IRQ
Change-Id: Iefd6852f2300f703ebed8b52aee627107a024f85
Signed-off-by: Andrew Wu <arw(a)dmp.com.tw>
See http://review.coreboot.org/4570 for details.
-gerrit