From 8b7a63e7e23f19b5947f8d6eedd22872d352dc54 Mon Sep 17 00:00:00 2001 From: Tim He Date: Tue, 27 Oct 2015 07:44:24 +0000 Subject: Vlv2TbltDevicePkg: Sync the branch changes to trunk. update some smbios string and macro name for MinnowBoard Turbot board. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Tim He Reviewed-by: David Wei git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18682 6f19259b-4bc3-4df7-8a09-765794883524 --- 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(-) (limited to 'Vlv2TbltDevicePkg') diff --git a/Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h b/Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h index 252535f754..50282ea2a8 100644 --- a/Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h +++ b/Vlv2TbltDevicePkg/Include/Guid/PlatformInfo.h @@ -176,8 +176,8 @@ typedef enum { 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; diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c index 6b5d20ba57..e38633b2b3 100644 --- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c +++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c @@ -370,7 +370,7 @@ ConfigurePlatformClocks ( switch (PlatformInfoHob->BoardId) { case BOARD_ID_MINNOW2: - case BOARD_ID_MINNOW2_COMPATIBLE: + case BOARD_ID_MINNOW2_TURBOT: default: switch(PlatformInfoHob->PlatformFlavor) { case FlavorTablet: diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c index d9ec3fa841..5209a74d71 100644 --- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c +++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardGpios/BoardGpios.c @@ -150,7 +150,7 @@ MultiPlatformGpioTableInit ( switch (PlatformInfoHob->BoardId) { case BOARD_ID_MINNOW2: // Minnow2 - case BOARD_ID_MINNOW2_COMPATIBLE: + case BOARD_ID_MINNOW2_TURBOT: Status = (**PeiServices).LocatePpi ( PeiServices, &gEfiPeiReadOnlyVariable2PpiGuid, @@ -509,7 +509,7 @@ MultiPlatformGpioProgram ( // 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); @@ -524,7 +524,7 @@ 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); } } diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c index dc2093121d..aec439165b 100644 --- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c +++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardOemIds/BoardOemIds.c @@ -34,7 +34,7 @@ InitializeBoardOemId ( 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; diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c index 9140009bad..768879246d 100644 --- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c +++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardSsidSvid/BoardSsidSvid.c @@ -32,7 +32,7 @@ InitializeBoardSsidSvid ( // 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; diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c index 368aa846e3..6e2d592f5f 100644 --- a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c +++ b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c @@ -905,7 +905,7 @@ PlatformEarlyInitEntry ( 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 ec5e4b3458..b0ab3e1c98 100644 --- a/Vlv2TbltDevicePkg/PlatformPei/Platform.c +++ b/Vlv2TbltDevicePkg/PlatformPei/Platform.c @@ -194,13 +194,13 @@ 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 ) { @@ -214,7 +214,7 @@ DetermineCompatibleBoard ( 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, @@ -934,10 +934,10 @@ ReadPlatformIds ( 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 24b9d44b7a..010231008a 100644 --- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c +++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c @@ -80,8 +80,8 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer) 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 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer) 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); diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c index 206167fe58..4981306bde 100644 --- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c +++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c @@ -69,8 +69,8 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscChassisManufacturer) 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); diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c index 99906d0613..420c8c3932 100644 --- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c +++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c @@ -93,9 +93,9 @@ AddSmbiosManuCallback ( 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 @@ AddSmbiosManuCallback ( 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); -- cgit v1.2.3