sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "tests: Allow specifying vboot source directory"

Browse Source 
This reverts commit 7713a2f295.

Reason for revert: breaks main branch

Change-Id: I2749bea9369c222e510b838e278c7797d5dce56e
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78852
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Patrick Georgi <patrick@coreboot.org>
This commit is contained in:
Felix Singer
2023-11-16 13:50:50 +00:00
committed by Martin L Roth
parent 7739e53398
commit 26e7c1eae4
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,7 +15,6 @@ absobj := $(abspath $(obj))
additional-dirs := additional-dirs :=
VBOOT_SOURCE ?= $(abspath 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.inc
View File

@@ -460,6 +460,7 @@ COREBOOT_EXPORTS += COREBOOT_EXTRA_VERSION
endif endif
CPPFLAGS_common := -Isrc -Isrc/include -Isrc/commonlib/include -Isrc/commonlib/bsd/include -I$(obj) 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 += -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$(VBOOT_SOURCE)/firmware/include -I$(top)/3rdparty/vboot/firmware/include
# Path for Kconfig autoheader # Path for Kconfig autoheader
TEST_INCLUDES += -I$(dir $(TEST_KCONFIG_AUTOHEADER)) TEST_INCLUDES += -I$(dir $(TEST_KCONFIG_AUTOHEADER))