From 26e7c1eae4120b0d7212d28f6dfa25f14484d319 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Thu, 16 Nov 2023 13:50:50 +0000 Subject: [PATCH] Revert "tests: Allow specifying vboot source directory" This reverts commit 7713a2f295d9ed9a7023a78e085ce190ee1203fe. Reason for revert: breaks main branch Change-Id: I2749bea9369c222e510b838e278c7797d5dce56e Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/78852 Reviewed-by: Martin L Roth Tested-by: build bot (Jenkins) Reviewed-by: Felix Held Reviewed-by: Patrick Georgi --- Makefile | 1 - Makefile.inc | 1 + tests/Makefile.common | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b0a99146ec..29597c8906 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,6 @@ absobj := $(abspath $(obj)) 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 2f810d52ad..e382518af0 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -460,6 +460,7 @@ COREBOOT_EXPORTS += COREBOOT_EXTRA_VERSION 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 9cc79d7a6f..e51d2530a2 100644 --- a/tests/Makefile.common +++ b/tests/Makefile.common @@ -36,7 +36,7 @@ TEST_INCLUDES += -I$(testsrc)/include/mocks -I$(testsrc)/include 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))