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

libpayload/vboot: Fix include paths fixup macro

Browse Source 
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>
This commit is contained in:
Jakub Czapiga 2022-03-22 17:56:51 +01:00 committed by Felix Held
parent 1ddf1b6422
commit 3068d562ae
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
payloads/libpayload/vboot/Makefile.inc
View File

@ -8,10 +8,11 @@ vboot_fw-objs += $(VBOOT_FW_LIB)
tlcl-objs += $(TLCL_LIB) tlcl-objs += $(TLCL_LIB)
kconfig-to-binary=$(if $(strip $(1)),1,0) 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,\ $(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),) ifeq ($(CONFIG_LP_ARCH_MOCK),)
VBOOT_CFLAGS += $(call vboot-fixup-includes,$(CFLAGS)) VBOOT_CFLAGS += $(call vboot-fixup-includes,$(CFLAGS))
VBOOT_CFLAGS += -I$(abspath $(obj)) VBOOT_CFLAGS += -I$(abspath $(obj))