Julius Werner submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Julius Werner: Looks good to me, approved
libpayload/bin/lpgcc: Make lpgcc provide TPM configuration for vboot

TPM1_MODE and TPM2_MODE defines have to be added to vboot and payload
cflags to make them build correctly without requiring payloads to provide
defines.

Signed-off-by: Jakub Czapiga <jacz@semihalf.com>
Change-Id: I567a9f04d7089699840dc7e0a063cf3030fb934b
Reviewed-on: https://review.coreboot.org/c/coreboot/+/62516
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
---
M payloads/libpayload/bin/lpgcc
1 file changed, 8 insertions(+), 0 deletions(-)

diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc
index 8bc46a6..77ceda3 100755
--- a/payloads/libpayload/bin/lpgcc
+++ b/payloads/libpayload/bin/lpgcc
@@ -182,6 +182,14 @@
_CFLAGS="$_CFLAGS -include $BASE/../include/kconfig.h -include $BASE/../include/compiler.h"
_CFLAGS="$_CFLAGS -I`$DEFAULT_CC $_ARCHEXTRA -print-search-dirs | head -n 1 | cut -d' ' -f2`include"

+if [ "$CONFIG_LP_VBOOT_LIB" = y ]; then
+ if [ "$CONFIG_LP_VBOOT_TPM2_MODE" = y ]; then
+ _CFLAGS="$_CFLAGS -DTPM2_MODE"
+ else
+ _CFLAGS="$_CFLAGS -DTPM1_MODE"
+ fi
+fi
+
_LDFLAGS="-L$_LIBDIR $_LDSCRIPT -static -Wl,--gc-sections"

if [ $DOLINK -eq 0 ]; then

To view, visit change 62516. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I567a9f04d7089699840dc7e0a063cf3030fb934b
Gerrit-Change-Number: 62516
Gerrit-PatchSet: 4
Gerrit-Owner: Jakub Czapiga <jacz@semihalf.com>
Gerrit-Reviewer: Julius Werner <jwerner@chromium.org>
Gerrit-Reviewer: Yu-Ping Wu <yupingso@google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Joey Madafferi <joeymadafferi@gmail.com>
Gerrit-MessageType: merged