Attention is currently required from: Jakub Czapiga. Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/61427 )
Change subject: libpayload: Refer to vboot source consistently ......................................................................
libpayload: Refer to vboot source consistently
Don't assume that libpayload is built from a fully checked out coreboot tree. There's already an override when building vboot, so reuse that override when referring to its header files.
While moving stuff around, move VBOOT_SOURCE from Makefile (generic build system stuff) to Makefile.inc (libpayload specific handling)
Signed-off-by: Patrick Georgi pgeorgi@google.com Change-Id: I503c69a593dd68b3a974fbdbb64d7bb25d6c7f63 --- M payloads/libpayload/Makefile M payloads/libpayload/Makefile.inc M payloads/libpayload/tests/Makefile.inc 3 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/61427/1
diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index 0104a11..2014cd4 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -45,7 +45,6 @@ export objutil ?= $(obj)/util export objk := $(objutil)/lp_kconfig export absobj := $(abspath $(obj)) -VBOOT_SOURCE ?= $(coreboottop)/3rdparty/vboot
export KCONFIG_AUTOHEADER := $(obj)/config.h export KCONFIG_AUTOCONFIG := $(obj)/auto.conf diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index 01c3ede..ebafeb6 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -59,10 +59,12 @@ subdirs-$(CONFIG_LP_LZ4) += liblz4 subdirs-$(CONFIG_LP_VBOOT_LIB) += vboot
+VBOOT_SOURCE ?= $(coreboottop)/3rdparty/vboot + INCLUDES := -Iinclude -Iinclude/$(ARCHDIR-y) -I$(obj) INCLUDES += -include include/kconfig.h -include include/compiler.h INCLUDES += -I$(coreboottop)/src/commonlib/bsd/include -INCLUDES += -I$(coreboottop)/3rdparty/vboot/firmware/include +INCLUDES += -I$(VBOOT_SOURCE)/firmware/include
CFLAGS += $(INCLUDES) -Os -pipe -nostdinc -ggdb3 CFLAGS += -nostdlib -fno-builtin -ffreestanding -fomit-frame-pointer diff --git a/payloads/libpayload/tests/Makefile.inc b/payloads/libpayload/tests/Makefile.inc index e1c2a23..529524c 100644 --- a/payloads/libpayload/tests/Makefile.inc +++ b/payloads/libpayload/tests/Makefile.inc @@ -34,7 +34,7 @@ TEST_CFLAGS += -Iinclude -Iinclude/mock TEST_CFLAGS += -I$(coreboottop)/src/commonlib/bsd/include TEST_CFLAGS += -I$(dir $(TEST_KCONFIG_AUTOHEADER)) -TEST_CFLAGS += -I$(coreboottop)/3rdparty/vboot/firmware/include +TEST_CFLAGS += -I$(VBOOT_SOURCE)/firmware/include
# Test specific includes TEST_CFLAGS += -I$(testsrc)/include