sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Vlv2TbltDevicePkg: Sync the branch changes to trunk.

Browse Source 
update some smbios string and macro name for MinnowBoard 
Turbot board.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tim He <tim.he@intel.com>
Reviewed-by: David Wei <david.wei@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18682 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Tim He
2015-10-27 07:44:24 +00:00
committed by timhe
parent b6f6125526
commit 8b7a63e7e2
10 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h
View File

@@ -176,8 +176,8 @@ typedef enum {
} EFI_PLATFORM_IGD_DATA; } EFI_PLATFORM_IGD_DATA;
typedef enum { typedef enum {
BOARD_ID_AV_SVP = 0x0, // Alpine Valley Board BOARD_ID_AV_SVP = 0x0, // Alpine Valley Board
BOARD_ID_BL_RVP = 0x2, // BayLake Board (RVP) BOARD_ID_BL_RVP = 0x2, // BayLake Board (RVP)
BOARD_ID_BL_FFRD8 = 0x3, // FFRD8 b'0011 BOARD_ID_BL_FFRD8 = 0x3, // FFRD8 b'0011
BOARD_ID_BL_FFRD = 0x4, // BayLake Board (FFRD) BOARD_ID_BL_FFRD = 0x4, // BayLake Board (FFRD)
BOARD_ID_BL_RVP_DDR3L = 0x5, // BayLake Board (RVP DDR3L) BOARD_ID_BL_RVP_DDR3L = 0x5, // BayLake Board (RVP DDR3L)

2
Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
View File

@@ -370,7 +370,7 @@ ConfigurePlatformClocks (
if(!EFI_ERROR (Status)){ if(!EFI_ERROR (Status)){
EnableSpreadSpectrum = SystemConfiguration.EnableClockSpreadSpec; EnableSpreadSpectrum = SystemConfiguration.EnableClockSpreadSpec;
} }
// //
// Perform platform-specific intialization dependent upon Board ID: // Perform platform-specific intialization dependent upon Board ID:
// //

6
Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c
View File

@@ -150,7 +150,7 @@ MultiPlatformGpioTableInit (
EFI_PEI_READ_ONLY_VARIABLE2_PPI *PeiReadOnlyVarPpi; EFI_PEI_READ_ONLY_VARIABLE2_PPI *PeiReadOnlyVarPpi;
UINTN VarSize; UINTN VarSize;
SYSTEM_CONFIGURATION SystemConfiguration; SYSTEM_CONFIGURATION SystemConfiguration;
DEBUG ((EFI_D_INFO, "MultiPlatformGpioTableInit()...\n")); DEBUG ((EFI_D_INFO, "MultiPlatformGpioTableInit()...\n"));
// //
@@ -509,7 +509,7 @@ MultiPlatformGpioProgram (
IoWrite32 (GPIO_BASE_ADDRESS + R_PCH_GPIO_SUS_TS, PlatformCfioDataPtr->TS_SS); IoWrite32 (GPIO_BASE_ADDRESS + R_PCH_GPIO_SUS_TS, PlatformCfioDataPtr->TS_SS);
// //
// GPIO Wake Enable. // GPIO Wake Enable.
// //
IoWrite32 (GPIO_BASE_ADDRESS + R_PCH_GPIO_SUS_WAKE_EN, PlatformCfioDataPtr->WE_SS); IoWrite32 (GPIO_BASE_ADDRESS + R_PCH_GPIO_SUS_WAKE_EN, PlatformCfioDataPtr->WE_SS);
@@ -524,7 +524,7 @@ MultiPlatformGpioProgram (
InternalGpioConfig(GPIO_NCORE_OFFSET, sizeof(mMinnow2_GpioInitData_NC)/sizeof(mMinnow2_GpioInitData_NC[0]), (GPIO_CONF_PAD_INIT *) (UINTN) PlatformInfoHob->PlatformGpioData_NC); InternalGpioConfig(GPIO_NCORE_OFFSET, sizeof(mMinnow2_GpioInitData_NC)/sizeof(mMinnow2_GpioInitData_NC[0]), (GPIO_CONF_PAD_INIT *) (UINTN) PlatformInfoHob->PlatformGpioData_NC);
InternalGpioConfig(GPIO_SSUS_OFFSET, sizeof(mMinnow2_GpioInitData_SUS)/sizeof(mMinnow2_GpioInitData_SUS[0]), (GPIO_CONF_PAD_INIT *) (UINTN) PlatformInfoHob->PlatformGpioData_SUS); InternalGpioConfig(GPIO_SSUS_OFFSET, sizeof(mMinnow2_GpioInitData_SUS)/sizeof(mMinnow2_GpioInitData_SUS[0]), (GPIO_CONF_PAD_INIT *) (UINTN) PlatformInfoHob->PlatformGpioData_SUS);
break; break;
default: default:
break; break;
} }

2
Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c
View File

@@ -34,7 +34,7 @@ InitializeBoardOemId (
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
) )
{ {
UINT64 OemId; UINT64 OemId;
UINT64 OemTableId; UINT64 OemTableId;
// //

2
Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c
View File

@@ -32,7 +32,7 @@ InitializeBoardSsidSvid (
InitializeBoardSsidSvid ( InitializeBoardSsidSvid (
IN CONST EFI_PEI_SERVICES **PeiServices, IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
) )
{ {
UINT32 SsidSvidValue = 0; UINT32 SsidSvidValue = 0;

2
Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
View File

@@ -905,7 +905,7 @@ PlatformEarlyInitEntry (
// //
// Baylake Board specific. // Baylake Board specific.
// //
if (PlatformInfo->BoardId == BOARD_ID_BL_RVP || if (PlatformInfo->BoardId == BOARD_ID_BL_RVP ||
PlatformInfo->BoardId == BOARD_ID_BL_FFRD || PlatformInfo->BoardId == BOARD_ID_BL_FFRD ||
PlatformInfo->BoardId == BOARD_ID_BL_FFRD8 || PlatformInfo->BoardId == BOARD_ID_BL_FFRD8 ||

16
Vlv2TbltDevicePkg/PlatformPei/Platform.c
View File

@@ -194,13 +194,13 @@ PeiSmbusExec (
PeiSmbusExec ( PeiSmbusExec (
UINT16 SmbusBase, UINT16 SmbusBase,
UINT8 SlvAddr, UINT8 SlvAddr,
UINT8 Operation, UINT8 Operation,
UINT8 Offset, UINT8 Offset,
UINT8 *Length, UINT8 *Length,
UINT8 *Buffer UINT8 *Buffer
); );
/** /**
Detemine Turbot board Detemine Turbot board
@@ -214,7 +214,7 @@ DetermineCompatibleBoard (
) )
{ {
UINTN PciD31F0RegBase = 0; UINTN PciD31F0RegBase = 0;
UINT32 GpioValue = 0; UINT32 GpioValue = 0;
UINT32 TmpVal = 0; UINT32 TmpVal = 0;
UINT32 MmioConf0 = 0; UINT32 MmioConf0 = 0;
UINT32 MmioPadval = 0; UINT32 MmioPadval = 0;
@@ -934,10 +934,10 @@ ReadPlatformIds (
&DataSize, &DataSize,
&TmpHob &TmpHob
); );
if (Status == EFI_SUCCESS) { if (Status == EFI_SUCCESS) {
PlatformInfoHob->BoardId = TmpHob.BoardId; PlatformInfoHob->BoardId = TmpHob.BoardId;
PlatformInfoHob->MemCfgID = TmpHob.MemCfgID; PlatformInfoHob->MemCfgID = TmpHob.MemCfgID;
PlatformInfoHob->BoardRev = TmpHob.BoardRev; PlatformInfoHob->BoardRev = TmpHob.BoardRev;
PlatformInfoHob->PlatformFlavor = TmpHob.PlatformFlavor; PlatformInfoHob->PlatformFlavor = TmpHob.PlatformFlavor;
return Status; return Status;

8
Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c
View File

@@ -80,8 +80,8 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer)
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
if (BOARD_ID_MINNOW2_COMPATIBLE == mPlatformInfo->BoardId) { if (BOARD_ID_MINNOW2_TURBOT == mPlatformInfo->BoardId) {
UnicodeSPrint (Buffer, sizeof (Buffer),L"Compatible Vendor"); UnicodeSPrint (Buffer, sizeof (Buffer),L"ADI");
HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_BASE_BOARD_MANUFACTURER), Buffer, NULL); HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_BASE_BOARD_MANUFACTURER), Buffer, NULL);
} }
TokenToGet = STRING_TOKEN (STR_MISC_BASE_BOARD_MANUFACTURER); TokenToGet = STRING_TOKEN (STR_MISC_BASE_BOARD_MANUFACTURER);
@@ -91,8 +91,8 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer)
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
if (BOARD_ID_MINNOW2_COMPATIBLE == mPlatformInfo->BoardId) { if (BOARD_ID_MINNOW2_TURBOT == mPlatformInfo->BoardId) {
UnicodeSPrint (Buffer, sizeof (Buffer),L"MinnowBoard Compatible Platform"); UnicodeSPrint (Buffer, sizeof (Buffer),L"MinnowBoard Turbot");
HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_BASE_BOARD_PRODUCT_NAME1), Buffer, NULL); HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_BASE_BOARD_PRODUCT_NAME1), Buffer, NULL);
} }
TokenToGet = STRING_TOKEN (STR_MISC_BASE_BOARD_PRODUCT_NAME1); TokenToGet = STRING_TOKEN (STR_MISC_BASE_BOARD_PRODUCT_NAME1);

4
Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c
View File

@@ -69,8 +69,8 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscChassisManufacturer)
EFI_MISC_CHASSIS_MANUFACTURER *ForType3InputData; EFI_MISC_CHASSIS_MANUFACTURER *ForType3InputData;
CHAR16 Buffer[40]; CHAR16 Buffer[40];
ForType3InputData = (EFI_MISC_CHASSIS_MANUFACTURER *)RecordData; ForType3InputData = (EFI_MISC_CHASSIS_MANUFACTURER *)RecordData;
// //
// First check for invalid parameters. // First check for invalid parameters.
// //

10
Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
View File

@@ -93,9 +93,9 @@ AddSmbiosManuCallback (
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
if (BOARD_ID_MINNOW2_COMPATIBLE == mPlatformInfo->BoardId) { if (BOARD_ID_MINNOW2_TURBOT == mPlatformInfo->BoardId) {
// Detect the board is compatible board platform // Detect the board is Turbot board platform
UnicodeSPrint (PlatformNameBuffer, sizeof (PlatformNameBuffer),L"%s",L"Minnowboard Compatible "); UnicodeSPrint (PlatformNameBuffer, sizeof (PlatformNameBuffer),L"%s",L"Minnowboard Turbot ");
} else { } else {
UnicodeSPrint (PlatformNameBuffer, sizeof (PlatformNameBuffer),L"%s",L"Minnowboard Max "); UnicodeSPrint (PlatformNameBuffer, sizeof (PlatformNameBuffer),L"%s",L"Minnowboard Max ");
} }
@@ -165,8 +165,8 @@ AddSmbiosManuCallback (
break; break;
} }
if (BOARD_ID_MINNOW2_COMPATIBLE == mPlatformInfo->BoardId) { if (BOARD_ID_MINNOW2_TURBOT == mPlatformInfo->BoardId) {
UnicodeSPrint (Buffer, sizeof (Buffer),L"Compatible Vendor"); UnicodeSPrint (Buffer, sizeof (Buffer),L"ADI");
HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_SYSTEM_MANUFACTURER), Buffer, NULL); HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_SYSTEM_MANUFACTURER), Buffer, NULL);
} }
TokenToGet = STRING_TOKEN (STR_MISC_SYSTEM_MANUFACTURER); TokenToGet = STRING_TOKEN (STR_MISC_SYSTEM_MANUFACTURER);