diff options
| -rw-r--r-- | src/drivers/intel/fsp1_1/vbt.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/drivers/intel/fsp1_1/vbt.c b/src/drivers/intel/fsp1_1/vbt.c index 2f8f7e20be..414b88d95a 100644 --- a/src/drivers/intel/fsp1_1/vbt.c +++ b/src/drivers/intel/fsp1_1/vbt.c @@ -14,34 +14,29 @@ * GNU General Public License for more details. */ -#include <cbfs.h> +#include <bootmode.h> #include <console/console.h> #include <fsp/ramstage.h> #include <fsp/util.h> -#include <lib.h> -#include <string.h> -#include <vendorcode/google/chromeos/chromeos.h> /* Locate VBT and pass it to FSP GOP */ void load_vbt(uint8_t s3_resume, SILICON_INIT_UPD *params) { - const optionrom_vbt_t *vbt_data; + const optionrom_vbt_t *vbt_data = NULL; uint32_t vbt_len; /* Check boot mode - for S3 resume path VBT loading is not needed */ if (s3_resume) { - vbt_data = NULL; printk(BIOS_DEBUG, "S3 resume do not pass VBT to GOP\n"); + } else if (display_init_required()) { + /* Get VBT data */ + vbt_data = fsp_get_vbt(&vbt_len); + if (vbt_data != NULL) + printk(BIOS_DEBUG, "Passing VBT to GOP\n"); + else + printk(BIOS_DEBUG, "VBT not found!\n"); } else { - if (developer_mode_enabled() || recovery_mode_enabled()) { - /* Get VBT data */ - vbt_data = fsp_get_vbt(&vbt_len); - if (vbt_data != NULL) - printk(BIOS_DEBUG, "Passing VBT to GOP\n"); - else - printk(BIOS_DEBUG, "VBT not found!\n"); - } else - vbt_data = NULL; + printk(BIOS_DEBUG, "Not passing VBT to GOP\n"); } params->GraphicsConfigPtr = (u32)vbt_data; } |