Revision: 18508
http://sourceforge.net/p/edk2/code/18508
Author: timhe
Date: 2015-09-18 03:01:05 +0000 (Fri, 18 Sep 2015)
Log Message:
-----------
Vlv2DeviceRefCodePkg: update some smbios string and macro name for MinnowBoard
Turbot board.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tim He <[email protected]>
Reviewed-by: David Wei <[email protected]>
Modified Paths:
--------------
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformPei/Platform.c
branches/UDK2014.SP1/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c
branches/UDK2014.SP1/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c
branches/UDK2014.SP1/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
Modified: branches/UDK2014.SP1/Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h
===================================================================
--- branches/UDK2014.SP1/Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h
2015-09-18 02:58:31 UTC (rev 18507)
+++ branches/UDK2014.SP1/Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h
2015-09-18 03:01:05 UTC (rev 18508)
@@ -185,8 +185,8 @@
BOARD_ID_BB_RVP = 0x20, // Bayley Bay Board
BOARD_ID_BS_RVP = 0x30, // Bakersport Board
BOARD_ID_CVH = 0x90, // Crestview Hills
- BOARD_ID_MINNOW2 = 0xA0, // Minnow2
- BOARD_ID_MINNOW2_COMPATIBLE = 0xB0 // Minnow2
+ BOARD_ID_MINNOW2 = 0xA0, // MinnowBorad Max
+ BOARD_ID_MINNOW2_TURBOT = 0xB0 // MinnowBoard Turbot
} BOARD_ID_LIST;
Modified:
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
===================================================================
---
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
2015-09-18 02:58:31 UTC (rev 18507)
+++
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
2015-09-18 03:01:05 UTC (rev 18508)
@@ -379,7 +379,7 @@
switch (PlatformInfoHob->BoardId) {
case BOARD_ID_MINNOW2:
- case BOARD_ID_MINNOW2_COMPATIBLE:
+ case BOARD_ID_MINNOW2_TURBOT:
default:
switch(PlatformInfoHob->PlatformFlavor) {
case FlavorTablet:
Modified:
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c
===================================================================
---
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c
2015-09-18 02:58:31 UTC (rev 18507)
+++
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c
2015-09-18 03:01:05 UTC (rev 18508)
@@ -159,7 +159,7 @@
switch (PlatformInfoHob->BoardId) {
case BOARD_ID_MINNOW2: // Minnow2
- case BOARD_ID_MINNOW2_COMPATIBLE:
+ case BOARD_ID_MINNOW2_TURBOT:
Status = (**PeiServices).LocatePpi (
PeiServices,
&gEfiPeiReadOnlyVariable2PpiGuid,
@@ -518,7 +518,7 @@
//
switch (PlatformInfoHob->BoardId) {
case BOARD_ID_MINNOW2:
- case BOARD_ID_MINNOW2_COMPATIBLE:
+ case BOARD_ID_MINNOW2_TURBOT:
DEBUG ((EFI_D_INFO, "Start to config Minnow2 GPIO pins\n"));
InternalGpioConfig(GPIO_SCORE_OFFSET,
sizeof(mMinnow2_GpioInitData_SC)/sizeof(mMinnow2_GpioInitData_SC[0]),
(GPIO_CONF_PAD_INIT *) (UINTN) PlatformInfoHob->PlatformGpioData_SC);
InternalGpioConfig(GPIO_NCORE_OFFSET,
sizeof(mMinnow2_GpioInitData_NC)/sizeof(mMinnow2_GpioInitData_NC[0]),
(GPIO_CONF_PAD_INIT *) (UINTN) PlatformInfoHob->PlatformGpioData_NC);
@@ -533,7 +533,7 @@
// configure the CFIO Pnp settings
//
if (PlatformInfoHob->CfioEnabled) {
- if (PlatformInfoHob->BoardId == BOARD_ID_MINNOW2 ||
PlatformInfoHob->BoardId == BOARD_ID_MINNOW2_COMPATIBLE){
+ if (PlatformInfoHob->BoardId == BOARD_ID_MINNOW2 ||
PlatformInfoHob->BoardId == BOARD_ID_MINNOW2_TURBOT){
InternalGpioConfig(GPIO_SCORE_OFFSET,
sizeof(mNB_BB_FAB3_GpioInitData_SC_TRI)/sizeof(mNB_BB_FAB3_GpioInitData_SC_TRI[0]),
(GPIO_CONF_PAD_INIT *) (UINTN)PlatformInfoHob->PlatformGpioData_SC_TRI);
}
}
Modified:
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c
===================================================================
---
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c
2015-09-18 02:58:31 UTC (rev 18507)
+++
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c
2015-09-18 03:01:05 UTC (rev 18508)
@@ -43,7 +43,7 @@
switch (PlatformInfoHob->BoardId) {
case BOARD_ID_MINNOW2:
- case BOARD_ID_MINNOW2_COMPATIBLE:
+ case BOARD_ID_MINNOW2_TURBOT:
default:
OemId = EFI_ACPI_OEM_ID_DEFAULT;
OemTableId = EFI_ACPI_OEM_TABLE_ID_DEFAULT;
Modified:
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c
===================================================================
---
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c
2015-09-18 02:58:31 UTC (rev 18507)
+++
branches/UDK2014.SP1/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c
2015-09-18 03:01:05 UTC (rev 18508)
@@ -41,7 +41,7 @@
//
switch (PlatformInfoHob->BoardId) {
case BOARD_ID_MINNOW2:
- case BOARD_ID_MINNOW2_COMPATIBLE:
+ case BOARD_ID_MINNOW2_TURBOT:
default:
SsidSvidValue = SUBSYSTEM_SVID_SSID;//SUBSYSTEM_SVID_SSID_DEFAULT;
break;
Modified:
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
===================================================================
--- branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
2015-09-18 02:58:31 UTC (rev 18507)
+++ branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
2015-09-18 03:01:05 UTC (rev 18508)
@@ -914,7 +914,7 @@
PlatformInfo->BoardId == BOARD_ID_BB_RVP ||
PlatformInfo->BoardId == BOARD_ID_BS_RVP ||
PlatformInfo->BoardId == BOARD_ID_MINNOW2 ||
- PlatformInfo->BoardId == BOARD_ID_MINNOW2_COMPATIBLE||
+ PlatformInfo->BoardId == BOARD_ID_MINNOW2_TURBOT||
PlatformInfo->BoardId == BOARD_ID_CVH) {
ConfigureLpssAndSccGpio(&SystemConfiguration, PlatformInfo);
Modified: branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformPei/Platform.c
===================================================================
--- branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformPei/Platform.c
2015-09-18 02:58:31 UTC (rev 18507)
+++ branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformPei/Platform.c
2015-09-18 03:01:05 UTC (rev 18508)
@@ -203,13 +203,13 @@
/**
- Detemine compatible board
- @return 0: Not compatible board
- 1: Compatible board
+ Detemine Turbot board
+ @return 0: Not Turbot board
+ 1: Turbot board
**/
UINT32
-DetermineCompatibleBoard (
+DetermineTurbotBoard (
void
)
{
@@ -223,7 +223,7 @@
UINT32 SSUSOffset = 0x2000;
UINT32 IoBase = 0;
- DEBUG ((EFI_D_ERROR, "DetermineCompatibleBoard() Entry\n"));
+ DEBUG ((EFI_D_ERROR, "DetermineTurbotBoard() Entry\n"));
PciD31F0RegBase = MmPciAddress (0,
0,
PCI_DEVICE_NUMBER_PCH_LPC,
@@ -943,10 +943,10 @@
return Status;
}
- CompatibleBoard = DetermineCompatibleBoard();
+ CompatibleBoard = DetermineTurbotBoard();
if (1 == CompatibleBoard) {
- PlatformInfoHob->BoardId = BOARD_ID_MINNOW2_COMPATIBLE;
- DEBUG ((EFI_D_INFO, "I'm MinnowBoard Compatible!\n"));
+ PlatformInfoHob->BoardId = BOARD_ID_MINNOW2_TURBOT;
+ DEBUG ((EFI_D_INFO, "I'm MinnowBoard Turbot!\n"));
} else {
PlatformInfoHob->BoardId = BOARD_ID_MINNOW2;
DEBUG ((EFI_D_INFO, "I'm MinnowBoard Max!\n"));
Modified:
branches/UDK2014.SP1/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c
===================================================================
---
branches/UDK2014.SP1/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c
2015-09-18 02:58:31 UTC (rev 18507)
+++
branches/UDK2014.SP1/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c
2015-09-18 03:01:05 UTC (rev 18508)
@@ -80,8 +80,8 @@
return EFI_INVALID_PARAMETER;
}
- if (BOARD_ID_MINNOW2_COMPATIBLE == mPlatformInfo->BoardId) {
- UnicodeSPrint (Buffer, sizeof (Buffer),L"Compatible Vendor");
+ if (BOARD_ID_MINNOW2_TURBOT == mPlatformInfo->BoardId) {
+ UnicodeSPrint (Buffer, sizeof (Buffer),L"ADI");
HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_BASE_BOARD_MANUFACTURER),
Buffer, NULL);
}
TokenToGet = STRING_TOKEN (STR_MISC_BASE_BOARD_MANUFACTURER);
@@ -91,8 +91,8 @@
return EFI_UNSUPPORTED;
}
- if (BOARD_ID_MINNOW2_COMPATIBLE == mPlatformInfo->BoardId) {
- UnicodeSPrint (Buffer, sizeof (Buffer),L"MinnowBoard Compatible Platform");
+ if (BOARD_ID_MINNOW2_TURBOT == mPlatformInfo->BoardId) {
+ UnicodeSPrint (Buffer, sizeof (Buffer),L"MinnowBoard Turbot");
HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_BASE_BOARD_PRODUCT_NAME1),
Buffer, NULL);
}
TokenToGet = STRING_TOKEN (STR_MISC_BASE_BOARD_PRODUCT_NAME1);
Modified:
branches/UDK2014.SP1/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c
===================================================================
---
branches/UDK2014.SP1/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c
2015-09-18 02:58:31 UTC (rev 18507)
+++
branches/UDK2014.SP1/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c
2015-09-18 03:01:05 UTC (rev 18508)
@@ -78,8 +78,8 @@
return EFI_INVALID_PARAMETER;
}
- if (BOARD_ID_MINNOW2_COMPATIBLE == mPlatformInfo->BoardId) {
- UnicodeSPrint (Buffer, sizeof (Buffer),L"Compatible Vendor");
+ if (BOARD_ID_MINNOW2_TURBOT == mPlatformInfo->BoardId) {
+ UnicodeSPrint (Buffer, sizeof (Buffer),L"ADI");
HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_CHASSIS_MANUFACTURER),
Buffer, NULL);
}
TokenToGet = STRING_TOKEN (STR_MISC_CHASSIS_MANUFACTURER);
Modified:
branches/UDK2014.SP1/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
===================================================================
---
branches/UDK2014.SP1/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
2015-09-18 02:58:31 UTC (rev 18507)
+++
branches/UDK2014.SP1/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
2015-09-18 03:01:05 UTC (rev 18508)
@@ -93,9 +93,9 @@
ASSERT_EFI_ERROR (Status);
- if (BOARD_ID_MINNOW2_COMPATIBLE == mPlatformInfo->BoardId) {
- // Detect the board is compatible board platform
- UnicodeSPrint (PlatformNameBuffer, sizeof
(PlatformNameBuffer),L"%s",L"Minnowboard Compatible ");
+ if (BOARD_ID_MINNOW2_TURBOT == mPlatformInfo->BoardId) {
+ // Detect the board is Turbot board platform
+ UnicodeSPrint (PlatformNameBuffer, sizeof
(PlatformNameBuffer),L"%s",L"Minnowboard Turbot ");
} else {
UnicodeSPrint (PlatformNameBuffer, sizeof
(PlatformNameBuffer),L"%s",L"Minnowboard Max ");
}
@@ -165,8 +165,8 @@
break;
}
- if (BOARD_ID_MINNOW2_COMPATIBLE == mPlatformInfo->BoardId) {
- UnicodeSPrint (Buffer, sizeof (Buffer),L"Compatible Vendor");
+ if (BOARD_ID_MINNOW2_TURBOT == mPlatformInfo->BoardId) {
+ UnicodeSPrint (Buffer, sizeof (Buffer),L"ADI");
HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_SYSTEM_MANUFACTURER),
Buffer, NULL);
}
TokenToGet = STRING_TOKEN (STR_MISC_SYSTEM_MANUFACTURER);
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
