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 --- .../SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c | 8 ++++---- .../SmBiosMiscDxe/MiscChassisManufacturerFunction.c | 4 ++-- .../SmBiosMiscDxe/MiscSystemManufacturerFunction.c | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'Vlv2TbltDevicePkg/SmBiosMiscDxe') 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