[coreboot-gerrit] Patch set updated for coreboot: bootblock: Link timestamp.c only with EARLY_CBMEM_INIT

[Paul Menzel (paulepanter@users.sourceforge.net)]

Paul Menzel (paulepanter at users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11875

-gerrit

commit b43a1d3d2031dab9692e905849bb36e1667856dc
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>
---
 src/lib/Makefile.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index b670782..f66cabe 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -28,7 +28,10 @@ bootblock-$(CONFIG_GENERIC_GPIO_LIB) += gpio.c
 bootblock-y += libgcc.c
 bootblock-$(CONFIG_GENERIC_UDELAY) += timer.c
 
+ifeq ($(CONFIG_EARLY_CBMEM_INIT),y)
 bootblock-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
+endif
+
 bootblock-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
 bootblock-$(CONFIG_I2C_TPM) += delay.c
 bootblock-y += memchr.c