commit 4a8c19cc90464ad215395bd116c9dc95fc682cac
author Lee Leahy <leroy.p.leahy@intel.com> Tue Jun 16 14:33:30 2015 -0700
committer Leroy P Leahy <leroy.p.leahy@intel.com> Wed Jun 24 17:03:49 2015 +0200
tree 3ce82af088b0bbb782d667a531f54641abeb1dfb
parent bfdf2489f071d8ee1d1c510e503b488526111eb7

FSP 1.1: Bring source up-to-date

Use 3rdparty/blobs subdirectory for binary files
Display the MTRRs after TempRamExit and before the MTRR setup
Clear all of the variable MTRRs before the MTRR setup
Define the FSP attributes location and bits
Properly display the FSP_RESERVED_MEMORY_RESOURCE_HOB and the
FSP_BOOTLOADER_TOLUM_HOB.

BRANCH=none
BUG=None
TEST=Build and run on cyan

Change-Id: I788a5f1e7676b1a06c1bcd66ddbd0a2249cad47c
Signed-off-by: Lee Leahy <leroy.p.leahy@intel.com>
Reviewed-on: http://review.coreboot.org/10589
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

src/drivers/intel/fsp1_1/hob.c

diff --git a/src/drivers/intel/fsp1_1/hob.c b/src/drivers/intel/fsp1_1/hob.c
index 905d3ec..6cc09fb 100644
--- a/src/drivers/intel/fsp1_1/hob.c
+++ b/src/drivers/intel/fsp1_1/hob.c
@@ -294,6 +294,7 @@
 		FSP_BOOTLOADER_TEMP_MEMORY_HOB_GUID;
 	const EFI_GUID bootldr_tolum_guid = FSP_BOOTLOADER_TOLUM_HOB_GUID;
 	const EFI_GUID graphics_info_guid = EFI_PEI_GRAPHICS_INFO_HOB_GUID;
+	const EFI_GUID memory_info_hob_guid = FSP_SMBIOS_MEMORY_INFO_GUID;
 
 	hob.Header = (EFI_HOB_GENERIC_HEADER *)hob_ptr;
 	switch (hob.Header->HobType) {
@@ -305,19 +306,21 @@
 		break;
 	case EFI_HOB_TYPE_RESOURCE_DESCRIPTOR:
 		hob_type_string = "EFI_HOB_TYPE_RESOURCE_DESCRIPTOR";
+		if (compare_guid(&fsp_reserved_guid, &hob.Guid->Name))
+			hob_type_string = "FSP_RESERVED_MEMORY_RESOURCE_HOB";
+		else if (compare_guid(&bootldr_tolum_guid, &hob.Guid->Name))
+			hob_type_string = "FSP_BOOTLOADER_TOLUM_HOB_GUID";
 		break;
 	case EFI_HOB_TYPE_GUID_EXTENSION:
 		hob_type_string = "EFI_HOB_TYPE_GUID_EXTENSION";
 		if (compare_guid(&bootldr_tmp_mem_guid, &hob.Guid->Name))
 			hob_type_string = "FSP_BOOTLOADER_TEMP_MEMORY_HOB";
-		else if (compare_guid(&fsp_reserved_guid, &hob.Guid->Name))
-			hob_type_string = "FSP_RESERVED_MEMORY_RESOURCE_HOB";
 		else if (compare_guid(&mrc_guid, &hob.Guid->Name))
 			hob_type_string = "FSP_NON_VOLATILE_STORAGE_HOB";
-		else if (compare_guid(&bootldr_tolum_guid, &hob.Guid->Name))
-			hob_type_string = "FSP_BOOTLOADER_TOLUM_HOB_GUID";
 		else if (compare_guid(&graphics_info_guid, &hob.Guid->Name))
 			hob_type_string = "EFI_PEI_GRAPHICS_INFO_HOB_GUID";
+		else if (compare_guid(&memory_info_hob_guid, &hob.Guid->Name))
+			hob_type_string = "FSP_SMBIOS_MEMORY_INFO_GUID";
 		break;
 	case EFI_HOB_TYPE_MEMORY_POOL:
 		hob_type_string = "EFI_HOB_TYPE_MEMORY_POOL";