[coreboot-gerrit] Patch merged into coreboot/master: 168b0f9 vboot: provide empty vboot_verify_firmware()

[gerrit at coreboot.org]

the following patch was just integrated into master:
commit 168b0f9e380ababdc1189bac6cd8b121d1adf3b7
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Thu Oct 10 20:58:57 2013 -0500

    vboot: provide empty vboot_verify_firmware()
    
    In the case of CONFIG_VBOOT_VERIFY_FIRMWARE not being
    selected allow for calling vboot_verify_firmware()
    with an empty implementation. This allows for one not to
    clutter the source with ifdefs.
    
    BUG=chrome-os-partner:23249
    BRANCH=None
    TEST=Built with a !CONFIG_VBOOT_VERIFY_FIRMWARE and non-guarded
         call to vboot_verify_firmware().
    
    Original-Change-Id: I72af717ede3c5d1db2a1f8e586fefcca82b191d5
    Original-Signed-off-by: Aaron Durbin <adurbin at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/172711
    Original-Reviewed-by: Shawn Nematbakhsh <shawnn at chromium.org>
    (cherry picked from commit c1e0e5c7b39c947b2a0c237b4678944ab86dd780)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    Conflicts:
    	src/vendorcode/google/chromeos/chromeos.h
    
    Change-Id: Iaaa3bedbe8de701726c28412e7eb75de0c58c9c9
    Reviewed-on: http://review.coreboot.org/7394
    Tested-by: build bot (Jenkins)
    Reviewed-by: David Hendricks <dhendrix at chromium.org>


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

-gerrit