Attention is currently required from: Felix Held, Jakub Czapiga, Martin L Roth, Yu-Ping Wu.
Hello build bot (Jenkins), Martin L Roth, Jakub Czapiga, Yu-Ping Wu, Felix Held,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/78852?usp=email
to review the following change.
Change subject: Revert "tests: Allow specifying vboot source directory" ......................................................................
Revert "tests: Allow specifying vboot source directory"
This reverts commit 7713a2f295d9ed9a7023a78e085ce190ee1203fe.
Reason for revert: breaks master
Change-Id: I2749bea9369c222e510b838e278c7797d5dce56e --- M Makefile M Makefile.inc M tests/Makefile.common 3 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/78852/1
diff --git a/Makefile b/Makefile index b0a99146..29597c8 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,6 @@
additional-dirs :=
-VBOOT_SOURCE ?= $(abspath 3rdparty/vboot) VBOOT_HOST_BUILD ?= $(abspath $(objutil)/vboot_lib)
COREBOOT_EXPORTS := COREBOOT_EXPORTS diff --git a/Makefile.inc b/Makefile.inc index 2f810d5..e382518 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -460,6 +460,7 @@ endif
CPPFLAGS_common := -Isrc -Isrc/include -Isrc/commonlib/include -Isrc/commonlib/bsd/include -I$(obj) +VBOOT_SOURCE ?= 3rdparty/vboot CPPFLAGS_common += -I$(VBOOT_SOURCE)/firmware/include CPPFLAGS_common += -include $(src)/include/kconfig.h CPPFLAGS_common += -include $(src)/include/rules.h diff --git a/tests/Makefile.common b/tests/Makefile.common index 9cc79d7..e51d253 100644 --- a/tests/Makefile.common +++ b/tests/Makefile.common @@ -36,7 +36,7 @@
TEST_INCLUDES += -I$(src) -I$(src)/include -I$(src)/commonlib/include \ -I$(src)/commonlib/bsd/include -I$(src)/arch/x86/include \ - -I$(VBOOT_SOURCE)/firmware/include + -I$(top)/3rdparty/vboot/firmware/include
# Path for Kconfig autoheader TEST_INCLUDES += -I$(dir $(TEST_KCONFIG_AUTOHEADER))
-
Felix Singer (Code Review)