Jakub Czapiga has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/59697 )
Change subject: libpayload: Add coreboot commonlib/bsd include path ......................................................................
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 jacz@semihalf.com --- M payloads/libpayload/Makefile M payloads/libpayload/Makefile.inc M payloads/libpayload/tests/Makefile.inc 3 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/59697/1
diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index ee83a0a..c68b514d 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -34,6 +34,7 @@ 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 8e0a3d6..2332517 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -58,6 +58,7 @@
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 ba465b0..c4463d7 100644 --- a/payloads/libpayload/tests/Makefile.inc +++ b/payloads/libpayload/tests/Makefile.inc @@ -11,8 +11,6 @@ endif coverage-dir := $(testobj)/coverage_reports
-coreboottop := ../../ - cmockasrc := $(coreboottop)/3rdparty/cmocka cmockaobj := $(objutil)/cmocka CMOCKA_LIB := $(cmockaobj)/src/libcmocka.so @@ -34,6 +32,7 @@ # 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