Paul Kocialkowski (contact@paulk.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11120
-gerrit
commit 246d57e5655afb6d31618fbd8c79c62e48aecde8 Author: Paul Kocialkowski contact@paulk.fr Date: Mon Aug 3 23:03:27 2015 +0200
chromeos: vboot: Adaptations for using a separate object out directory
$(obj) might be defined either as a relative or an absolute path. This, it has to be filtered out before adding $(top) to it (in case of an absolute path) when building vboot. It is then provided separately in CFLAGS (as an absolute path).
In addition, VB2_LIB inherits $(obj), so it might also already be an absolute path, and prefixing $(top) to it doesn't apply. Thus, the absolute path to it should be passed to the vboot make command.
Change-Id: I13e893ebdf22c4513ee40d9331a30ac7de8f9788 Signed-off-by: Paul Kocialkowski contact@paulk.fr --- src/vendorcode/google/chromeos/vboot2/Makefile.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/vendorcode/google/chromeos/vboot2/Makefile.inc b/src/vendorcode/google/chromeos/vboot2/Makefile.inc index 9026df6..b805993 100644 --- a/src/vendorcode/google/chromeos/vboot2/Makefile.inc +++ b/src/vendorcode/google/chromeos/vboot2/Makefile.inc @@ -55,10 +55,10 @@ endif endif # CONFIG_SEPARATE_VERSTAGE
VB2_LIB = $(obj)/external/vboot_reference/vboot_fw20.a -VBOOT_CFLAGS += $(patsubst -I%,-I$(top)/%,$(filter-out -include $(src)/include/kconfig.h, $(CPPFLAGS_libverstage))) +VBOOT_CFLAGS += $(patsubst -I%,-I$(top)/%, $(filter-out -I$(obj), $(filter-out -include $(src)/include/kconfig.h, $(CPPFLAGS_libverstage)))) VBOOT_CFLAGS += $(CFLAGS_libverstage) VBOOT_CFLAGS += $(libverstage-c-ccopts) -VBOOT_CFLAGS += -include $(top)/src/include/kconfig.h -Wno-missing-prototypes +VBOOT_CFLAGS += -I$(abspath $(obj)) -include $(top)/src/include/kconfig.h -Wno-missing-prototypes VBOOT_CFLAGS += -DVBOOT_DEBUG
$(VB2_LIB): $(obj)/config.h @@ -67,7 +67,7 @@ $(VB2_LIB): $(obj)/config.h CC="$(CC_verstage)" \ CFLAGS="$(VBOOT_CFLAGS)" VBOOT2="y" \ $(MAKE) -C $(VB_SOURCE) \ - BUILD=$(top)/$(dir $(VB2_LIB)) \ + BUILD=$(abspath $(dir $(VB2_LIB))) \ V=$(V) \ fwlib20