diff options
| author | Jakub Czapiga <jacz@semihalf.com> | 2022-01-12 09:59:39 +0000 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2022-01-15 00:22:41 +0000 |
| commit | 395f5b3129ad046a220aa4cf975279bfdebc19df (patch) | |
| tree | 477af2cff7d7a40e47067c88b11178c4b9ff574b /payloads/libpayload | |
| parent | d74b8d9c990780ba64515b36aaff79d719d71ead (diff) | |
libpayload: Install vboot headers and add include paths to lpgcc
New CBFS API uses commonlib/bsd/cbfs_serialized.h, which includes
vboot's vb2_sha.h. And, because vboot's includes are not available
in libpayload's installation directory nor in lpgcc paths, it was
causing compilation errors. This patch fixes this issue.
lpgcc will look for `vboot` directory like it is doing for `include`
directory to create correct paths. However, if payload will be built
using libpayload's build dir as a base, then vboot headers from
3rdparty/vboot will be used, as there is no way to pass VBOOT_SOURCE
from makefile to lpgcc.
Moreover, this patch moves VBOOT_SOURCE to the main Makefile to
make it available for installation target, to install headers from
vboot directory provided by caller.
Change-Id: I68dd7e1545cfcaf24547d8a9fe289447c79da222
Signed-off-by: Jakub Czapiga <jacz@semihalf.com>
Reported-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61032
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'payloads/libpayload')
| -rw-r--r-- | payloads/libpayload/Makefile | 1 | ||||
| -rw-r--r-- | payloads/libpayload/Makefile.inc | 9 | ||||
| -rw-r--r-- | payloads/libpayload/bin/lp.functions | 6 | ||||
| -rwxr-xr-x | payloads/libpayload/bin/lpgcc | 3 | ||||
| -rw-r--r-- | payloads/libpayload/vboot/Makefile.inc | 2 |
5 files changed, 19 insertions, 2 deletions
diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index 2014cd4ec9..0104a11fbc 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -45,6 +45,7 @@ export obj ?= build export objutil ?= $(obj)/util export objk := $(objutil)/lp_kconfig export absobj := $(abspath $(obj)) +VBOOT_SOURCE ?= $(coreboottop)/3rdparty/vboot export KCONFIG_AUTOHEADER := $(obj)/config.h export KCONFIG_AUTOCONFIG := $(obj)/auto.conf diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index ac7bb81715..c540bb7dbc 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -131,6 +131,15 @@ install: real-target $(foreach item,$(includes), \ install -m 755 -d $(DESTDIR)/libpayload/include/$(call extract_nth,2,$(item)); \ install -m 644 $(call extract_nth,1,$(item)) $(DESTDIR)/libpayload/include/$(call extract_nth,2,$(item)); ) + printf " INSTALL $(DESTDIR)/libpayload/vboot\n" + install -m 755 -d $(DESTDIR)/libpayload/vboot + for file in `find $(VBOOT_SOURCE)/firmware/include \ + $(VBOOT_SOURCE)/firmware/2lib/include \ + -iname '*.h' -type f \ + | sed 's,$(VBOOT_SOURCE)/firmware/,,'`; do \ + install -m 755 -d $(DESTDIR)/libpayload/vboot/$$(dirname $$file); \ + install -m 644 $(VBOOT_SOURCE)/firmware/$$file $(DESTDIR)/libpayload/vboot/$$file ; \ + done printf " INSTALL $(DESTDIR)/libpayload/bin\n" install -m 755 -d $(DESTDIR)/libpayload/bin install -m 755 bin/lpgcc $(DESTDIR)/libpayload/bin diff --git a/payloads/libpayload/bin/lp.functions b/payloads/libpayload/bin/lp.functions index fd26956243..d641e69991 100644 --- a/payloads/libpayload/bin/lp.functions +++ b/payloads/libpayload/bin/lp.functions @@ -63,3 +63,9 @@ if [ -d $BASE/../include ]; then else _INCDIR=$LIBPAYLOAD_PREFIX/include fi + +if [ -d $BASE/../vboot ]; then + _VBOOTINCDIR=$BASE/../vboot/include +else + _VBOOTINCDIR=$LIBPAYLOAD_PREFIX/../vboot/include +fi diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc index a0b736b5e3..2ad9ef525a 100755 --- a/payloads/libpayload/bin/lpgcc +++ b/payloads/libpayload/bin/lpgcc @@ -169,6 +169,9 @@ if [ $_LIBDIR = $_OBJ ]; then fi _CFLAGS="$_CFLAGS -I$BASE/../../../src/commonlib/bsd/include" + _CFLAGS="$_CFLAGS -I$BASE/../../../3rdparty/vboot/firmware/include" +else + _CFLAGS="$_CFLAGS -I$_VBOOTINCDIR" fi # Check for the -fno-stack-protector silliness diff --git a/payloads/libpayload/vboot/Makefile.inc b/payloads/libpayload/vboot/Makefile.inc index 8289f63945..9e9e90bcdd 100644 --- a/payloads/libpayload/vboot/Makefile.inc +++ b/payloads/libpayload/vboot/Makefile.inc @@ -1,7 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -VBOOT_SOURCE ?= $(coreboottop)/3rdparty/vboot - VBOOT_BUILD_DIR ?= $(abspath $(obj)/external/vboot) VBOOT_FW_LIB = $(VBOOT_BUILD_DIR)/vboot_fw.a TLCL_LIB = $(VBOOT_BUILD_DIR)/tlcl.a |