[coreboot-gerrit] Patch merged into coreboot/master: b5995b5 rk3288: Add CBMEM console support and fix RETURN_FROM_VERSTAGE

[gerrit at coreboot.org]

the following patch was just integrated into master:
commit b5995b5872803838e7f3e03d3fb4f64a290d978f
Author: Julius Werner <jwerner at chromium.org>
Date:   Mon Dec 1 13:28:47 2014 -0800

    rk3288: Add CBMEM console support and fix RETURN_FROM_VERSTAGE
    
    Since we can now reduce our vboot2 work buffer by 4K, we can use all
    that hard-earned space for the CBMEM console instead (and 4K are
    unfortunately barely enough for all the stuff we dump with vboot2).
    
    Also add console_init() and exception_init() to the verstage for
    CONFIG_RETURN_FROM_VERSTAGE, which was overlooked before (our model
    requires those functions to be called again at the beginning of every
    stage... even though some consoles like UARTs might not need it, others
    like the CBMEM console do). In the !RETURN_FROM_VERSTAGE case, this is
    expected to be done by the platform-specific verstage entry wrapper, and
    already in place for the only implementation we have for now (tegra124).
    
    (Technically, there is still a bug in the case where EARLY_CONSOLE is
    set but BOOTBLOCK_CONSOLE isn't, since both verstage and romstage would
    run init_console_ptr() as if they were there first, so the romstage
    overwrites the verstage's output. I don't think it's worth fixing that
    now, since EARLY_CONSOLE && !BOOTBLOCK_CONSOLE is a pretty pointless
    use-case and I think we should probably just get rid of the
    CONFIG_BOOTBLOCK_CONSOLE option eventually.)
    
    BRANCH=None
    BUG=None
    TEST=Booted Pinky.
    
    Change-Id: I87914df3c72f0262eb89f337454009377a985497
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 85486928abf364c5d5d1cf69f7668005ddac023c
    Original-Change-Id: Id666cb7a194d32cfe688861ab17c5e908bc7760d
    Original-Signed-off-by: Julius Werner <jwerner at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/232614
    Reviewed-on: http://review.coreboot.org/9607
    Tested-by: build bot (Jenkins)
    Reviewed-by: Stefan Reinauer <stefan.reinauer at coreboot.org>


See http://review.coreboot.org/9607 for details.

-gerrit