From 16eb4031c69c694d991424ef0905cce1103050e8 Mon Sep 17 00:00:00 2001 From: Ashwin Kumar Date: Tue, 29 Oct 2019 13:20:06 +0530 Subject: [PATCH] trogdor: QCSDI loading depends on VB2_GBB_FLAG_RUNNING_FAFT setting flag Change-Id: I63f35c94bc6c60934ace5fe0fd9176443059b354 Signed-off-by: Ashwin Kumar Reviewed-on: https://review.coreboot.org/c/coreboot/+/36518 Reviewed-by: Julius Werner Tested-by: build bot (Jenkins) --- src/soc/qualcomm/common/qclib.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/soc/qualcomm/common/qclib.c b/src/soc/qualcomm/common/qclib.c index 6bf2f0ed25..d06cb429eb 100644 --- a/src/soc/qualcomm/common/qclib.c +++ b/src/soc/qualcomm/common/qclib.c @@ -13,6 +13,8 @@ #include #include #include +#include +#include struct qclib_cb_if_table qclib_cb_if_table = { .magic = QCLIB_MAGIC_NUMBER, @@ -144,9 +146,11 @@ void qclib_load_and_run(void) qclib_cb_if_table.global_attributes = QCLIB_GA_ENABLE_UART_LOGGING; - if (CONFIG(QC_SDI_ENABLE)) { + if (CONFIG(QC_SDI_ENABLE) && (!CONFIG(VBOOT) || + !vboot_is_gbb_flag_set(VB2_GBB_FLAG_RUNNING_FAFT))) { struct prog qcsdi = - PROG_INIT(PROG_REFCODE, CONFIG_CBFS_PREFIX "/qcsdi"); + PROG_INIT(PROG_REFCODE, + CONFIG_CBFS_PREFIX "/qcsdi"); /* Attempt to load QCSDI elf */ if (prog_locate(&qcsdi)) @@ -155,8 +159,8 @@ void qclib_load_and_run(void) if (cbfs_prog_stage_load(&qcsdi)) goto fail; - qclib_add_if_table_entry(QCLIB_TE_QCSDI, prog_entry(&qcsdi), - prog_size(&qcsdi), 0); + qclib_add_if_table_entry(QCLIB_TE_QCSDI, + prog_entry(&qcsdi), prog_size(&qcsdi), 0); printk(BIOS_INFO, "qcsdi.entry[%p]\n", qcsdi.entry); }