[coreboot-gerrit] Patch merged into coreboot/master: 599c32d marvell/bg4cd: merge verstage into bootblock

[gerrit at coreboot.org]

the following patch was just integrated into master:
commit 599c32d8ef908f0b9723eb864f0a8695f6a76758
Author: Daisuke Nojiri <dnojiri at chromium.org>
Date:   Wed Dec 3 12:09:58 2014 -0800

    marvell/bg4cd: merge verstage into bootblock
    
    If verified boot is enabled, merge verstage into bootblock. This also
    requires custom bootblock code to actually call into verstage.
    [pg: modified to match upstream]
    
    BUG=chrome-os-partner:32631
    BRANCH=ToT
    TEST=booted on cosmos development board.
    
    Change-Id: I53251aac966ee15da24232c23fefa636de8b253b
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 2b8ada263017b46afa755b5acb759574184dba06
    Original-Signed-off-by: Daisuke Nojiri <dnojiri at chromium.org>
    Original-Change-Id: Ia0e1236357aa32bf553fb8cc98f3a8d29de17f45
    Original-Reviewed-on: https://chromium-review.googlesource.com/229795
    Original-Reviewed-by: Julius Werner <jwerner at chromium.org>
    Reviewed-on: http://review.coreboot.org/10008
    Tested-by: build bot (Jenkins)
    Reviewed-by: Paul Menzel <paulepanter at users.sourceforge.net>
    Reviewed-by: Stefan Reinauer <stefan.reinauer at coreboot.org>


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

-gerrit