diff options
| author | Frans Hendriks <fhendriks@eltan.com> | 2019-06-28 14:11:41 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-07-10 10:24:12 +0000 |
| commit | 509f46953ece919b1610b685599e146461ae4163 (patch) | |
| tree | 132f0614b2f0b22797dcb658032e08a7a967f33c /src/drivers/intel/fsp1_1/ramstage.c | |
| parent | 71c6c1725e0efe77787a8d3b7aaf14c0c0eba166 (diff) | |
drivers/intel/fsp1_1/raminit.c: Always check FSP HOBs
Check for FSP HOBs is depending on CONFIG_DISPLAY_HOBS.
Use the CONFIG_DISPLAY_HOBS for display HOB info only and always check HOBs.
Use BIOS_ERR of printk() for FSP errors.
BUG=N/A
TEST=Check console output on Facebook FBG1701.
Change-Id: I3776fa37866c7ef3aea090842387660c22bbdd4d
Signed-off-by: Frans Hendriks <fhendriks@eltan.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/29371
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Diffstat (limited to 'src/drivers/intel/fsp1_1/ramstage.c')
| -rw-r--r-- | src/drivers/intel/fsp1_1/ramstage.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/drivers/intel/fsp1_1/ramstage.c b/src/drivers/intel/fsp1_1/ramstage.c index 814bddf007..52a886ce30 100644 --- a/src/drivers/intel/fsp1_1/ramstage.c +++ b/src/drivers/intel/fsp1_1/ramstage.c @@ -52,19 +52,16 @@ static void smm_memory_map(void) static void display_hob_info(FSP_INFO_HEADER *fsp_info_header) { const EFI_GUID graphics_info_guid = EFI_PEI_GRAPHICS_INFO_HOB_GUID; - int missing_hob = 0; void *hob_list_ptr = get_hob_list(); - if (!CONFIG(DISPLAY_HOBS)) - return; - /* Verify the HOBs */ if (hob_list_ptr == NULL) { - printk(BIOS_INFO, "ERROR - HOB pointer is NULL!\n"); + printk(BIOS_ERR, "ERROR - HOB pointer is NULL!\n"); return; } - print_hob_type_structure(0, hob_list_ptr); + if (CONFIG(DISPLAY_HOBS)) + print_hob_type_structure(0, hob_list_ptr); /* * Verify that FSP is generating the required HOBs: @@ -77,14 +74,12 @@ static void display_hob_info(FSP_INFO_HEADER *fsp_info_header) * FSP_SMBIOS_MEMORY_INFO HOB verified by raminit */ if ((fsp_info_header->ImageAttribute & GRAPHICS_SUPPORT_BIT) && - !get_next_guid_hob(&graphics_info_guid, hob_list_ptr)) { - printk(BIOS_INFO, "7.5: EFI_PEI_GRAPHICS_INFO_HOB missing!\n"); - missing_hob = 1; - } - - if (missing_hob) - printk(BIOS_INFO, + !get_next_guid_hob(&graphics_info_guid, hob_list_ptr) && + CONFIG(DISPLAY_HOBS)) { + printk(BIOS_ERR, "7.5: EFI_PEI_GRAPHICS_INFO_HOB missing!\n"); + printk(BIOS_ERR, "ERROR - Missing one or more required FSP HOBs!\n"); + } } void fsp_run_silicon_init(FSP_INFO_HEADER *fsp_info_header, int is_s3_wakeup) |