From 073fe5871e9a20e694ec49801d2d5c422fc4f8c4 Mon Sep 17 00:00:00 2001 From: Samer El-Haj-Mahmoud elhaj Date: Tue, 2 Sep 2014 20:03:36 +0000 Subject: [PATCH] Update SmbiosView Shell command to display additional CPU Family and Socket designations, and fix a couple of typos Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Samer El-Haj-Mahmoud elhaj@hp.com Reviewed-By: Jaben Carsey git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16036 6f19259b-4bc3-4df7-8a09-765794883524 --- .../SmbiosView/PrintInfo.c | 42 +++++++++++++++++- .../SmbiosView/QueryTable.c | 10 ++++- .../SmbiosView/SmbiosViewStrings.uni | Bin 98068 -> 109216 bytes 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c index 9ae5a0c741..7bb3998f0c 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c @@ -2,6 +2,7 @@ Module for clarifying the content of the smbios structure element information. Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.
+ Copyright (c) 2014, Hewlett-Packard Development Company, L.P.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -1532,6 +1533,10 @@ DisplayProcessorFamily ( Print (L"AMD Opteron 4200 Series Processor\n"); break; + case 0x3F: + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_FX_SERIES), gShellDebug1HiiHandle); + break; + case 0x40: ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_MIPS_FAMILY), gShellDebug1HiiHandle); break; @@ -1565,13 +1570,37 @@ DisplayProcessorFamily ( break; case 0x48: - Print (L"AMD S-Series Processor\n"); + Print (L"AMD A-Series Processor\n"); break; case 0x49: Print (L"AMD G-Series Processor\n"); break; + case 0x4A: + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_Z_SERIES), gShellDebug1HiiHandle); + break; + + case 0x4B: + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_R_SERIES), gShellDebug1HiiHandle); + break; + + case 0x4C: + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_OPTERON_4300_SERIES), gShellDebug1HiiHandle); + break; + + case 0x4D: + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_OPTERON_6300_SERIES), gShellDebug1HiiHandle); + break; + + case 0x4E: + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_OPTERON_3300_SERIES), gShellDebug1HiiHandle); + break; + + case 0x4F: + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_OPTERON_FIREPRO_SERIES), gShellDebug1HiiHandle); + break; + case 0x50: ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_SPARC_FAMILY), gShellDebug1HiiHandle); break; @@ -1909,7 +1938,7 @@ DisplayProcessorFamily ( break; case 0xCC: - Print (L"zArchitectur\n"); + Print (L"zArchitecture\n"); break; case 0xCD: @@ -1972,6 +2001,15 @@ DisplayProcessorFamily ( Print (L"Multi-Core Intel Xeon processor 3400 Series\n"); break; + case 0xE4: + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_OPTERON_3000_SERIES), gShellDebug1HiiHandle); + break; + + case 0xE5: + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_SEMPRON_II), gShellDebug1HiiHandle); + break; + + case 0xE6: ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_AMD_EMBEDDED_OPTERON_QUAD_CORE), gShellDebug1HiiHandle); break; diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c index 700592d263..de6df5f12b 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c @@ -469,7 +469,7 @@ TABLE_ITEM ProcessorUpgradeTable[] = { }, { 0x24, - L"Socket BGA1155" + L"Socket LGA1155" }, { 0x25, @@ -494,6 +494,14 @@ TABLE_ITEM ProcessorUpgradeTable[] = { { 0x2A, L"Socket FM2" + }, + { + 0x2B, + L"Socket LGA2011-3" + }, + { + 0x2C, + L"Socket LGA1356-3" } }; diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni index 1d73ba3fd7448a04934be509ef809fed0511c726..f4e6a0fa1938d2b1a7aee13c85104972f21eff56 100644 GIT binary patch delta 7170 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 delta 7208 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