Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tim He <[email protected]>
---
Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h | 4 ++--
.../Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c | 2 +-
.../Library/MultiPlatformLib/BoardGpios/BoardGpios.c | 6 +++---
.../Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c | 2 +-
.../MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c | 2 +-
Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c | 2 +-
Vlv2TbltDevicePkg/PlatformPei/Platform.c | 16 ++++++++--------
.../SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c | 8 ++++----
.../SmBiosMiscDxe/MiscChassisManufacturerFunction.c | 4 ++--
.../SmBiosMiscDxe/MiscSystemManufacturerFunction.c | 10 +++++-----
10 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h
b/Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h
index 252535f..50282ea 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h
@@ -174,12 +174,12 @@ typedef enum {
BOARD_ID_BL_RVP_DDR3L = 0x5, // BayLake Board (RVP DDR3L)
BOARD_ID_BL_STHI = 0x7, // PPV- STHI Board
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;
typedef enum {
FAB1 = 0,
diff --git
a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
index 6b5d20b..e38633b 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
@@ -368,11 +368,11 @@ ConfigurePlatformClocks (
DEBUG((EFI_D_ERROR, "board id is %x, platform id is
%x\n",PlatformInfoHob->BoardId,PlatformInfoHob->PlatformFlavor));
switch (PlatformInfoHob->BoardId) {
case BOARD_ID_MINNOW2:
- case BOARD_ID_MINNOW2_COMPATIBLE:
+ case BOARD_ID_MINNOW2_TURBOT:
default:
switch(PlatformInfoHob->PlatformFlavor) {
case FlavorTablet:
ConfigurationTable = ConfigurationTable_Tablet;
Length = sizeof (ConfigurationTable_Tablet);
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c
b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c
index d9ec3fa..5209a74 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c
@@ -148,11 +148,11 @@ MultiPlatformGpioTableInit (
// Select/modify the GPIO initialization data based on the Board ID.
//
switch (PlatformInfoHob->BoardId) {
case BOARD_ID_MINNOW2: // Minnow2
- case BOARD_ID_MINNOW2_COMPATIBLE:
+ case BOARD_ID_MINNOW2_TURBOT:
Status = (**PeiServices).LocatePpi (
PeiServices,
&gEfiPeiReadOnlyVariable2PpiGuid,
0,
NULL,
@@ -507,11 +507,11 @@ MultiPlatformGpioProgram (
//
// Config SC/NC/SUS GPIO Pins
//
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);
InternalGpioConfig(GPIO_SSUS_OFFSET,
sizeof(mMinnow2_GpioInitData_SUS)/sizeof(mMinnow2_GpioInitData_SUS[0]),
(GPIO_CONF_PAD_INIT *) (UINTN) PlatformInfoHob->PlatformGpioData_SUS);
break;
@@ -522,11 +522,11 @@ MultiPlatformGpioProgram (
//
// 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);
}
}
#else
DEBUG ((EFI_D_INFO, "Skip MultiPlatformGpioProgram()...for SIMICS or HYB
model\n"));
diff --git
a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c
b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c
index dc20931..aec4391 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c
@@ -32,11 +32,11 @@ InitializeBoardOemId (
// Set OEM ID according to Board ID.
//
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;
break;
}
diff --git
a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c
b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c
index 9140009..7688792 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c
@@ -30,11 +30,11 @@ InitializeBoardSsidSvid (
//
// Set OEM ID according to Board ID.
//
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;
}
PlatformInfoHob->SsidSvid = SsidSvidValue;
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
index 368aa84..6e2d592 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
@@ -903,11 +903,11 @@ PlatformEarlyInitEntry (
PlatformInfo->BoardId == BOARD_ID_BL_RVP_DDR3L ||
PlatformInfo->BoardId == BOARD_ID_BL_STHI ||
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);
}
diff --git a/Vlv2TbltDevicePkg/PlatformPei/Platform.c
b/Vlv2TbltDevicePkg/PlatformPei/Platform.c
index ec5e4b3..b0ab3e1 100644
--- a/Vlv2TbltDevicePkg/PlatformPei/Platform.c
+++ b/Vlv2TbltDevicePkg/PlatformPei/Platform.c
@@ -192,17 +192,17 @@ PeiSmbusExec (
);
/**
- 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
)
{
UINTN PciD31F0RegBase = 0;
UINT32 GpioValue = 0;
@@ -212,11 +212,11 @@ DetermineCompatibleBoard (
UINT32 PConf0Offset = 0x200; //GPIO_S5_4 pad_conf0 register offset
UINT32 PValueOffset = 0x208; //GPIO_S5_4 pad_value register offset
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,
PCI_FUNCTION_NUMBER_PCH_LPC,
0
@@ -932,14 +932,14 @@ ReadPlatformIds (
PlatformInfoHob->BoardRev = TmpHob.BoardRev;
PlatformInfoHob->PlatformFlavor = TmpHob.PlatformFlavor;
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"));
}
diff --git
a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c
b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c
index 24b9d44..0102310 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c
@@ -78,23 +78,23 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer)
//
if (RecordData == NULL || mPlatformInfo == NULL) {
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);
Manufacturer = SmbiosMiscGetString (TokenToGet);
ManuStrLen = StrLen(Manufacturer);
if (ManuStrLen > SMBIOS_STRING_MAX_LENGTH) {
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);
Product = SmbiosMiscGetString (TokenToGet);
ProductStrLen = StrLen(Product);
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c
b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c
index 206167f..4981306 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c
@@ -67,12 +67,12 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscChassisManufacturer)
//
if (RecordData == NULL || mPlatformInfo == NULL) {
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);
Manufacturer = SmbiosMiscGetString (TokenToGet);
ManuStrLen = StrLen(Manufacturer);
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
index 99906d0..420c8c3 100644
--- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
@@ -91,13 +91,13 @@ AddSmbiosManuCallback (
Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID *)
&Smbios);
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 ");
}
//
@@ -163,12 +163,12 @@ AddSmbiosManuCallback (
default:
DEBUG ((EFI_D_ERROR, "Unknow Stepping Detected\n"));
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);
Manufacturer = SmbiosMiscGetString (TokenToGet);
ManuStrLen = StrLen(Manufacturer);
--
1.9.5.msysgit.1
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel
