Commit 16eb4031 authored by Ashwin Kumar's avatar Ashwin Kumar Committed by Julius Werner
Browse files

trogdor: QCSDI loading depends on VB2_GBB_FLAG_RUNNING_FAFT setting flag



Change-Id: I63f35c94bc6c60934ace5fe0fd9176443059b354
Signed-off-by: default avatarAshwin Kumar <ashk@codeaurora.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36518

Reviewed-by: default avatarJulius Werner <jwerner@chromium.org>
Tested-by: default avatarbuild bot (Jenkins) <no-reply@coreboot.org>
parent 9ec99342
......@@ -13,6 +13,8 @@
#include <soc/mmu_common.h>
#include <soc/qclib_common.h>
#include <soc/symbols_common.h>
#include <security/vboot/misc.h>
#include <vb2_api.h>
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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment