[coreboot-gerrit] Patch merged into coreboot/master: bootblock: Link timestamp.c only with EARLY_CBMEM_INIT

[gerrit at coreboot.org]

the following patch was just integrated into master:
commit 2ea25552e9a78a01d522384be4193292527b017f
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date:   Tue Oct 13 17:30:57 2015 +0200

    bootblock: Link timestamp.c only with EARLY_CBMEM_INIT
    
    Commit dbeedbef (arch/x86/bootblock: Link in object files selected with
    bootblock-y) breaks building of x86 boards with
    `CONFIG_EARLY_CBMEM_INIT` *not* selected but CBMEM time stamp collection
    enabled.
    
    Aaron Durbin explained as below [1] and provided this patch to fix it.
    
    > That change actually processes bootblock-objs where before it never did
    > such a thing. I'm sure this isn’t the only issue lurking. bootblock on
    > x86 implied romcc and thus all the bootblock-y += rules that other
    > architectures use worked, but now all the implied assumptions are no
    > longer true on x86.
    >
    > timestamp stuff on x86 !CONFIG_EARLY_CBMEM_INIT is the issue you're
    > seeing. In order to compile timestamp.c for bootblock under these
    > conditions will mean there needs to be some more Makefile guarding.
    
    [1] http://review.coreboot.org/11864
    
    Change-Id: I3441b9fcdbbc8bbe82b9f2075e60668a846ecf09
    Fix-by: Aaron Durbin <adurbin at chromium.org>
    Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>
    Reviewed-on: http://review.coreboot.org/11875
    Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    Reviewed-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
    Tested-by: build bot (Jenkins)


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

-gerrit