tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-23 21:54:27 +02:00
Code Issues 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
Show Stats 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 {
BOARD_ID_BB_RVP = 0x20, // Bayley Bay Board BOARD_ID_BB_RVP = 0x20, // Bayley Bay Board
BOARD_ID_BS_RVP = 0x30, // Bakersport Board BOARD_ID_BS_RVP = 0x30, // Bakersport Board
BOARD_ID_CVH = 0x90, // Crestview Hills BOARD_ID_CVH = 0x90, // Crestview Hills
BOARD_ID_MINNOW2 = 0xA0, // Minnow2 BOARD_ID_MINNOW2 = 0xA0, // MinnowBorad Max
BOARD_ID_MINNOW2_COMPATIBLE = 0xB0 // Minnow2 BOARD_ID_MINNOW2_TURBOT = 0xB0 // MinnowBoard Turbot
} BOARD_ID_LIST; } BOARD_ID_LIST;

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

@ -370,7 +370,7 @@ ConfigurePlatformClocks (
switch (PlatformInfoHob->BoardId) { switch (PlatformInfoHob->BoardId) {
case BOARD_ID_MINNOW2: case BOARD_ID_MINNOW2:
case BOARD_ID_MINNOW2_COMPATIBLE: case BOARD_ID_MINNOW2_TURBOT:
default: default:
switch(PlatformInfoHob->PlatformFlavor) { switch(PlatformInfoHob->PlatformFlavor) {
case FlavorTablet: case FlavorTablet:

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

@ -150,7 +150,7 @@ MultiPlatformGpioTableInit (
switch (PlatformInfoHob->BoardId) { switch (PlatformInfoHob->BoardId) {
case BOARD_ID_MINNOW2: // Minnow2 case BOARD_ID_MINNOW2: // Minnow2
case BOARD_ID_MINNOW2_COMPATIBLE: case BOARD_ID_MINNOW2_TURBOT:
Status = (**PeiServices).LocatePpi ( Status = (**PeiServices).LocatePpi (
PeiServices, PeiServices,
&gEfiPeiReadOnlyVariable2PpiGuid, &gEfiPeiReadOnlyVariable2PpiGuid,
@ -509,7 +509,7 @@ MultiPlatformGpioProgram (
// //
switch (PlatformInfoHob->BoardId) { switch (PlatformInfoHob->BoardId) {
case BOARD_ID_MINNOW2: 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")); 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_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); InternalGpioConfig(GPIO_NCORE_OFFSET, sizeof(mMinnow2_GpioInitData_NC)/sizeof(mMinnow2_GpioInitData_NC[0]), (GPIO_CONF_PAD_INIT *) (UINTN) PlatformInfoHob->PlatformGpioData_NC);
@ -524,7 +524,7 @@ MultiPlatformGpioProgram (
// configure the CFIO Pnp settings // configure the CFIO Pnp settings
// //
if (PlatformInfoHob->CfioEnabled) { 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); 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);
} }
} }

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

@ -34,7 +34,7 @@ InitializeBoardOemId (
switch (PlatformInfoHob->BoardId) { switch (PlatformInfoHob->BoardId) {
case BOARD_ID_MINNOW2: case BOARD_ID_MINNOW2:
case BOARD_ID_MINNOW2_COMPATIBLE: case BOARD_ID_MINNOW2_TURBOT:
default: default:
OemId = EFI_ACPI_OEM_ID_DEFAULT; OemId = EFI_ACPI_OEM_ID_DEFAULT;
OemTableId = EFI_ACPI_OEM_TABLE_ID_DEFAULT; OemTableId = EFI_ACPI_OEM_TABLE_ID_DEFAULT;

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

@ -32,7 +32,7 @@ InitializeBoardSsidSvid (
// //
switch (PlatformInfoHob->BoardId) { switch (PlatformInfoHob->BoardId) {
case BOARD_ID_MINNOW2: case BOARD_ID_MINNOW2:
case BOARD_ID_MINNOW2_COMPATIBLE: case BOARD_ID_MINNOW2_TURBOT:
default: default:
SsidSvidValue = SUBSYSTEM_SVID_SSID;//SUBSYSTEM_SVID_SSID_DEFAULT; SsidSvidValue = SUBSYSTEM_SVID_SSID;//SUBSYSTEM_SVID_SSID_DEFAULT;
break; break;

2
Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
View File

@ -905,7 +905,7 @@ PlatformEarlyInitEntry (
PlatformInfo->BoardId == BOARD_ID_BB_RVP || PlatformInfo->BoardId == BOARD_ID_BB_RVP ||
PlatformInfo->BoardId == BOARD_ID_BS_RVP || PlatformInfo->BoardId == BOARD_ID_BS_RVP ||
PlatformInfo->BoardId == BOARD_ID_MINNOW2 || PlatformInfo->BoardId == BOARD_ID_MINNOW2 ||
PlatformInfo->BoardId == BOARD_ID_MINNOW2_COMPATIBLE|| PlatformInfo->BoardId == BOARD_ID_MINNOW2_TURBOT||
PlatformInfo->BoardId == BOARD_ID_CVH) { PlatformInfo->BoardId == BOARD_ID_CVH) {
ConfigureLpssAndSccGpio(&SystemConfiguration, PlatformInfo); ConfigureLpssAndSccGpio(&SystemConfiguration, PlatformInfo);

16
Vlv2TbltDevicePkg/PlatformPei/Platform.c
View File

@ -194,13 +194,13 @@ PeiSmbusExec (
/** /**
Detemine compatible board Detemine Turbot board
@return 0: Not compatible board @return 0: Not Turbot board
1: Compatible board 1: Turbot board
**/ **/
UINT32 UINT32
DetermineCompatibleBoard ( DetermineTurbotBoard (
void void
) )
{ {
@ -214,7 +214,7 @@ DetermineCompatibleBoard (
UINT32 SSUSOffset = 0x2000; UINT32 SSUSOffset = 0x2000;
UINT32 IoBase = 0; UINT32 IoBase = 0;
DEBUG ((EFI_D_ERROR, "DetermineCompatibleBoard() Entry\n")); DEBUG ((EFI_D_ERROR, "DetermineTurbotBoard() Entry\n"));
PciD31F0RegBase = MmPciAddress (0, PciD31F0RegBase = MmPciAddress (0,
0, 0,
PCI_DEVICE_NUMBER_PCH_LPC, PCI_DEVICE_NUMBER_PCH_LPC,
@ -934,10 +934,10 @@ ReadPlatformIds (
return Status; return Status;
} }
CompatibleBoard = DetermineCompatibleBoard(); CompatibleBoard = DetermineTurbotBoard();
if (1 == CompatibleBoard) { if (1 == CompatibleBoard) {
PlatformInfoHob->BoardId = BOARD_ID_MINNOW2_COMPATIBLE; PlatformInfoHob->BoardId = BOARD_ID_MINNOW2_TURBOT;
DEBUG ((EFI_D_INFO, "I'm MinnowBoard Compatible!\n")); DEBUG ((EFI_D_INFO, "I'm MinnowBoard Turbot!\n"));
} else { } else {
PlatformInfoHob->BoardId = BOARD_ID_MINNOW2; PlatformInfoHob->BoardId = BOARD_ID_MINNOW2;
DEBUG ((EFI_D_INFO, "I'm MinnowBoard Max!\n")); DEBUG ((EFI_D_INFO, "I'm MinnowBoard Max!\n"));

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)
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_CHASSIS_MANUFACTURER), Buffer, NULL); HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_CHASSIS_MANUFACTURER), Buffer, NULL);
} }
TokenToGet = STRING_TOKEN (STR_MISC_CHASSIS_MANUFACTURER); TokenToGet = STRING_TOKEN (STR_MISC_CHASSIS_MANUFACTURER);

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);