Patch set updated for coreboot: 846157b vboot: pass correct coreboot include paths

[Stefan Reinauer]

Stefan Reinauer ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2860

-gerrit

commit 846157bdc95fa0ccb44fd896430c5f3c57a73ce8
Author: Aaron Durbin <[e-mail]>
Date:   Tue Mar 19 12:43:18 2013 -0500

    vboot: pass correct coreboot include paths
    
    The coreboot include were not being passed correctly when
    building vboot_reference. The paths being included were of the
    src/<dir> form. However, vboot_reference lives in
    src/../vboot_reference. That coupled with the recursive make
    call made vboot_reference not see coreboot's header files.
    Fix this by appending ../ to coreboot's default include paths.
    
    Change-Id: I73949c6f854ecfce77ac36bb995918d51f91445e
    Signed-off-by: Aaron Durbin <[e-mail]>
---
 src/vendorcode/google/chromeos/Makefile.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc
index 9bc4d64..abcd429 100644
--- a/src/vendorcode/google/chromeos/Makefile.inc
+++ b/src/vendorcode/google/chromeos/Makefile.inc
@@ -53,9 +53,11 @@ VBOOT_STUB_DEPS += $(obj)/lib/memcmp.rmodules.o
 VBOOT_STUB_DEPS += $(obj)/arch/x86/lib/memset.rmodules.o
 VBOOT_STUB_DEPS += $(obj)/arch/x86/lib/memcpy.rmodules.o
 VBOOT_STUB_DEPS += $(VB_LIB)
-# Remove the '-include' option since that will break vboot's build.
-VBOOT_CFLAGS += $(filter-out -include $(src)/include/kconfig.h, $(CFLAGS))
+# Remove the '-include' option since that will break vboot's build and ensure
+# vboot_reference can get to coreboot's include files.
+VBOOT_CFLAGS += $(patsubst -I%,-I../%,$(filter-out -include $(src)/include/kconfig.h, $(CFLAGS)))
 VBOOT_CFLAGS += -DVBOOT_DEBUG
+$(warning $(VBOOT_CFLAGS))
 
 $(VBOOT_STUB_DOTO): $(VBOOT_STUB_DEPS)
 	$(CC) $(LDFLAGS) -nostdlib -r -o $@ $^