Change in coreboot[master]: libpayload/vboot: Fix include paths fixup macro

[Jakub Czapiga (Code Review)]

Jakub Czapiga has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63002 )

Change subject: libpayload/vboot: Fix include paths fixup macro
......................................................................

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 ti fix this behavior.

Signed-off-by: Jakub Czapiga 
Change-Id: I264e715fa879a4e56b6e5f5423916298e8780a2b
---
M payloads/libpayload/vboot/Makefile.inc
1 file changed, 4 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/63002/1

diff --git a/payloads/libpayload/vboot/Makefile.inc b/payloads/libpayload/vboot/Makefile.inc
index bd1afa8..6b6ae9d 100644
--- a/payloads/libpayload/vboot/Makefile.inc
+++ b/payloads/libpayload/vboot/Makefile.inc
@@ -8,10 +8,11 @@
 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))