From 39b2e7abdd8abf3553311dd547d7929c3411cbab Mon Sep 17 00:00:00 2001 From: Jakub Czapiga Date: Tue, 23 Nov 2021 09:21:30 +0000 Subject: libpayload: Add coreboot commonlib/bsd include path Make BSD part of the coreboot commonlib accessible to libpayload. Change-Id: I09f475d399ab785f3d3ffdb4b42950d2b397845e Signed-off-by: Jakub Czapiga Reviewed-on: https://review.coreboot.org/c/coreboot/+/59697 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- payloads/libpayload/Makefile | 1 + payloads/libpayload/Makefile.inc | 1 + payloads/libpayload/tests/Makefile.inc | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'payloads/libpayload') diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index ee83a0aeca..1da8c64c15 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -34,6 +34,7 @@ CC_real:=$(CC) endif export top := $(CURDIR) +export coreboottop ?= $(abspath $(top)/../../) export src := src export srck := $(abspath $(top)/../../util/kconfig) export obj ?= build diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index 8e0a3d6f77..2332517cef 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -58,6 +58,7 @@ subdirs-$(CONFIG_LP_LZ4) += liblz4 INCLUDES := -Iinclude -Iinclude/$(ARCHDIR-y) -I$(obj) INCLUDES += -include include/kconfig.h -include include/compiler.h +INCLUDES += -I$(coreboottop)/src/commonlib/bsd/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 ba465b0471..c4463d705a 100644 --- a/payloads/libpayload/tests/Makefile.inc +++ b/payloads/libpayload/tests/Makefile.inc @@ -11,8 +11,6 @@ testobj := $(obj)/tests endif coverage-dir := $(testobj)/coverage_reports -coreboottop := ../../ - cmockasrc := $(coreboottop)/3rdparty/cmocka cmockaobj := $(objutil)/cmocka CMOCKA_LIB := $(cmockaobj)/src/libcmocka.so @@ -34,6 +32,7 @@ TEST_CONFIG_ := CONFIG_LP_ # Default includes 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 specific includes -- cgit v1.2.3