diff options
| author | Marshall Dawson <marshalldawson3rd@gmail.com> | 2019-10-17 07:58:27 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2019-10-20 21:49:33 +0000 |
| commit | 7a9e894550c4b1893ad7ca76911649051f817814 (patch) | |
| tree | e842bf8f60d71cad9d04d91096a9de2b64bf650a /src/drivers | |
| parent | 1dcc170215f5c4116c04d05acd1328bb7962621b (diff) | |
drivers/intel/fsp2_0: Make vbt_get() conditional
Skip calling vbt_get() if FSP is not supposed to run GOP.
Change-Id: I6b8cd3646ffcd6df39229d4e36b315dfb7a8c859
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36111
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/intel/fsp2_0/silicon_init.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c index ecc6e96ace..88ec88a19d 100644 --- a/src/drivers/intel/fsp2_0/silicon_init.c +++ b/src/drivers/intel/fsp2_0/silicon_init.c @@ -70,15 +70,12 @@ static void do_silicon_init(struct fsp_header *hdr) /* Handle any errors returned by FspSiliconInit */ fsp_handle_reset(status); if (status != FSP_SUCCESS) { - if (vbt_get()) { - /* Attempted to initialize graphics. Assume failure - * is related to a video failure. - */ + /* Assume video failure if attempted to initialize graphics */ + if (CONFIG(RUN_FSP_GOP) && vbt_get()) postcode = POST_VIDEO_FAILURE; - } else { - /* Other silicon initialization failed */ - postcode = POST_HW_INIT_FAILURE; - } + else + postcode = POST_HW_INIT_FAILURE; /* else generic */ + printk(BIOS_SPEW, "FspSiliconInit returned 0x%08x\n", status); die_with_post_code(postcode, "FspSiliconInit returned an error!\n"); |