erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reland "tests: Allow specifying vboot source directory"

Browse source 
Respect VBOOT_SOURCE while including generic headers.

This reverts commit 26e7c1eae4.

BUG=none
TEST=make clean-unit-tests &&
     VBOOT_SOURCE=/path/to/vboot_reference/ make unit-tests -j
TEST=make clean-unit-tests && make unit-tests -j
BRANCH=none

Change-Id: I686575f7c5e22bee519e910f71a4ac579b5c6a50
Signed-off-by: Hsuan Ting Chen <roccochen@chromium.org>
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/89176
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Hsuan-ting Chen <roccochen@google.com>
This commit is contained in:
roccochen@chromium.com 2023-11-02 15:49:02 +08:00 • committed by Matt DeVillier
commit e7d598ba2c
3 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -15,6 +15,7 @@ absobj := $(abspath $(obj))
additional-dirs := additional-dirs :=
VBOOT_SOURCE ?= 3rdparty/vboot
VBOOT_HOST_BUILD ?= $(abspath $(objutil)/vboot_lib) VBOOT_HOST_BUILD ?= $(abspath $(objutil)/vboot_lib)
COREBOOT_EXPORTS := COREBOOT_EXPORTS COREBOOT_EXPORTS := COREBOOT_EXPORTS

1
Makefile.mk
View file

@ -484,7 +484,6 @@ CPPFLAGS_common += -Isrc/include
CPPFLAGS_common += -Isrc/commonlib/include CPPFLAGS_common += -Isrc/commonlib/include
CPPFLAGS_common += -Isrc/commonlib/bsd/include CPPFLAGS_common += -Isrc/commonlib/bsd/include
CPPFLAGS_common += -I$(obj) CPPFLAGS_common += -I$(obj)
VBOOT_SOURCE ?= 3rdparty/vboot
CPPFLAGS_common += -I$(VBOOT_SOURCE)/firmware/include CPPFLAGS_common += -I$(VBOOT_SOURCE)/firmware/include
CPPFLAGS_common += -include $(src)/include/kconfig.h CPPFLAGS_common += -include $(src)/include/kconfig.h
CPPFLAGS_common += -include $(src)/include/rules.h CPPFLAGS_common += -include $(src)/include/rules.h

2
tests/Makefile.common
View file

@ -36,7 +36,7 @@ TEST_INCLUDES += -I$(testsrc)/include/mocks -I$(testsrc)/include
TEST_INCLUDES += -I$(src) -I$(src)/include -I$(src)/commonlib/include \ TEST_INCLUDES += -I$(src) -I$(src)/include -I$(src)/commonlib/include \
-I$(src)/commonlib/bsd/include -I$(src)/arch/x86/include \ -I$(src)/commonlib/bsd/include -I$(src)/arch/x86/include \
-I$(top)/3rdparty/vboot/firmware/include -I$(abspath $(VBOOT_SOURCE))/firmware/include
# Path for Kconfig autoheader # Path for Kconfig autoheader
TEST_INCLUDES += -I$(dir $(TEST_KCONFIG_AUTOHEADER)) TEST_INCLUDES += -I$(dir $(TEST_KCONFIG_AUTOHEADER))