From 49f0f9a42244fe9cfb494df4b8551dba75d5126a Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 27 Jan 2022 15:28:13 +0100 Subject: [PATCH] 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 Change-Id: I503c69a593dd68b3a974fbdbb64d7bb25d6c7f63 Reviewed-on: https://review.coreboot.org/c/coreboot/+/61427 Tested-by: build bot (Jenkins) Reviewed-by: HAOUAS Elyes Reviewed-by: Rob Barnes --- payloads/libpayload/Makefile.inc | 2 +- payloads/libpayload/tests/Makefile.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index 01c3ede4fc..430994b366 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -62,7 +62,7 @@ subdirs-$(CONFIG_LP_VBOOT_LIB) += 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 e1c2a232d4..529524ca32 100644 --- a/payloads/libpayload/tests/Makefile.inc +++ b/payloads/libpayload/tests/Makefile.inc @@ -34,7 +34,7 @@ TEST_CFLAGS := -include include/kconfig.h -include include/compiler.h 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