Patrick Georgi has submitted this change. ( 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.
Signed-off-by: Patrick Georgi pgeorgi@google.com Change-Id: I503c69a593dd68b3a974fbdbb64d7bb25d6c7f63 Reviewed-on: https://review.coreboot.org/c/coreboot/+/61427 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: HAOUAS Elyes ehaouas@noos.fr Reviewed-by: Rob Barnes robbarnes@google.com --- M payloads/libpayload/Makefile.inc M payloads/libpayload/tests/Makefile.inc 2 files changed, 2 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified HAOUAS Elyes: Looks good to me, approved Rob Barnes: Looks good to me, approved
diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index 01c3ede..430994b 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -62,7 +62,7 @@ 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