summaryrefslogtreecommitdiff
path: root/payloads/libpayload/vboot
diff options
context:
space:
mode:
authorJakub Czapiga <jacz@semihalf.com>2022-03-22 17:56:51 +0100
committerFelix Held <felix-coreboot@felixheld.de>2022-03-25 19:25:36 +0000
commit3068d562aeb0b065d01e2d0f728a9f5c91ce434d (patch)
tree04d1ab39063a970f68f0e44d4084a57b3a37e031 /payloads/libpayload/vboot
parent1ddf1b6422d6c3c39b82021c8bd4d16a2550f12d (diff)
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 <jacz@semihalf.com> Change-Id: I264e715fa879a4e56b6e5f5423916298e8780a2b Reviewed-on: https://review.coreboot.org/c/coreboot/+/63002 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'payloads/libpayload/vboot')
-rw-r--r--payloads/libpayload/vboot/Makefile.inc7
1 files changed, 4 insertions, 3 deletions
diff --git a/payloads/libpayload/vboot/Makefile.inc b/payloads/libpayload/vboot/Makefile.inc
index bd1afa811b..3ec3278be2 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))