From 3068d562aeb0b065d01e2d0f728a9f5c91ce434d Mon Sep 17 00:00:00 2001 From: Jakub Czapiga Date: Tue, 22 Mar 2022 17:56:51 +0100 Subject: libpayload/vboot: Fix include paths fixup macro Include paths fixup macro for vboot was broken and was adding unnecessary prefix to paths from $(coreboottop). This patch adds correct filters to fix this behavior. Signed-off-by: Jakub Czapiga Change-Id: I264e715fa879a4e56b6e5f5423916298e8780a2b Reviewed-on: https://review.coreboot.org/c/coreboot/+/63002 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- payloads/libpayload/vboot/Makefile.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'payloads') diff --git a/payloads/libpayload/vboot/Makefile.inc b/payloads/libpayload/vboot/Makefile.inc index bd1afa811b55..3ec3278be290 100644 --- a/payloads/libpayload/vboot/Makefile.inc +++ b/payloads/libpayload/vboot/Makefile.inc @@ -8,10 +8,11 @@ vboot_fw-objs += $(VBOOT_FW_LIB) tlcl-objs += $(TLCL_LIB) kconfig-to-binary=$(if $(strip $(1)),1,0) -vboot-fixup-includes = $(patsubst -I%,-I$(top)/%,\ +vboot-fixup-includes = $(filter -I$(coreboottop)/%, $(1)) \ + $(patsubst -I%,-I$(top)/%,\ $(patsubst include/%.h,$(top)/include/%.h,\ - $(filter-out -I$(obj),$(1)))) - + $(filter-out -I$(obj),\ + $(filter-out -I$(coreboottop)/%,$(1))))) ifeq ($(CONFIG_LP_ARCH_MOCK),) VBOOT_CFLAGS += $(call vboot-fixup-includes,$(CFLAGS)) VBOOT_CFLAGS += -I$(abspath $(obj)) -- cgit v1.2.3