[coreboot-gerrit] Patch set updated for coreboot: bb4c174 rk3288: Adjust CBFS header and ROM offsets

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9410

-gerrit

commit bb4c1745f051e92f7c0b2cc1f3c480a76f695c5e
Author: Julius Werner <jwerner at chromium.org>
Date:   Thu Nov 6 17:32:58 2014 -0800

    rk3288: Adjust CBFS header and ROM offsets
    
    Our CBFS header offset on rk3288 was very low and overlapped with the
    end of the bootblock on recent Pinky builds. This can create all kinds
    of fun effects like BSS variables suddenly being initialized to
    something else than zero, in an effect that jumps somewhere else for
    every slightest code size change.
    
    This patch moves the CBFS header offset up a bit and the CBFS ROM offset
    down (because there's really no point in leaving such a large gap). This
    resolves our immediate booting problems, and I'll also start on a patch
    to add further checks somewhere that catch these overlaps in the future.
    
    BRANCH=None
    BUG=None
    TEST=Created a Pinky image from the exact same commit version as the
    official 6443.0.0 build, with a KERNELREVISION string of the exact same
    length as the builder (which for some arcane reason is different than
    running emerge locally, shifting the whole bootblock around with it).
    Confirmed that I saw the same "Not enough room for another
    sub-pagetable!" hang, and that this patch fixes it.
    
    Change-Id: I9e59a282b3cd0af3b0d224d64c10b7c4d312ad02
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 1a142cd2c51c6f51a1597c21ad513feb151e0938
    Original-Change-Id: I8be5b7b7e87021cc1b3a91d336e8d233546ee188
    Original-Signed-off-by: Julius Werner <jwerner at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/228326
    Original-Reviewed-by: Gediminas Ramanauskas <gedis at chromium.org>
    Original-Reviewed-by: David Hendricks <dhendrix at chromium.org>
---
 src/soc/rockchip/rk3288/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig
index 0865fe8..b2fd0fb 100644
--- a/src/soc/rockchip/rk3288/Kconfig
+++ b/src/soc/rockchip/rk3288/Kconfig
@@ -48,10 +48,10 @@ config BOOTBLOCK_ROM_OFFSET
 
 config CBFS_HEADER_ROM_OFFSET
 	hex
-	default 0x0008000
+	default 0x0010000
 
 config CBFS_ROM_OFFSET
 	hex
-	default 0x0018000
+	default 0x0010100
 
 endif