ShellPkg/UefiShellDebug1CommandsLib

With Itanium architecture unsupported, gEfiSalSystemTableGuid
and gEfiMpsTableGuid will be no longer used.
https://bugzilla.tianocore.org/show_bug.cgi?id=1560

v2:Withdraw the removal of #include <Guid/Mps.h> and
   gEfiMpsTableGuid.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
index 59eee3082a5e093baec3e9a4be0a12bc0caa4d7e..e6aec2e37ccf783ae335874e9de67e73d781d1ab 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
@@ -13,7 +13,6 @@
 #include <Guid/Acpi.h>\r
 #include <Guid/Mps.h>\r
 #include <Guid/SmBios.h>\r
 #include <Guid/Acpi.h>\r
 #include <Guid/Mps.h>\r
 #include <Guid/SmBios.h>\r

-#include <Guid/SalSystemTable.h>\r

 \r
 /**\r
   Make a printable character.\r
 \r
 /**\r
   Make a printable character.\r


@@ -180,10 +179,6 @@ ShellCommandRunDmem (
               AcpiTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;\r
               continue;\r
             }\r
               AcpiTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;\r
               continue;\r
             }\r

-            if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiSalSystemTableGuid)) {\r
-              SalTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;\r
-              continue;\r
-            }\r

             if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiSmbiosTableGuid)) {\r
               SmbiosTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;\r
               continue;\r
             if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiSmbiosTableGuid)) {\r
               SmbiosTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;\r
               continue;\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
index 2c8894a2cd08670b3b31f2f313fa510e2109244f..ed94477a0642b593e844342e0f6fd64886c318e6 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
@@ -126,7 +126,6 @@
   gEfiSmbiosTableGuid             ## SOMETIMES_CONSUMES ## SystemTable\r
   gEfiSmbios3TableGuid            ## SOMETIMES_CONSUMES ## SystemTable\r
   gEfiMpsTableGuid                ## SOMETIMES_CONSUMES ## SystemTable\r
   gEfiSmbiosTableGuid             ## SOMETIMES_CONSUMES ## SystemTable\r
   gEfiSmbios3TableGuid            ## SOMETIMES_CONSUMES ## SystemTable\r
   gEfiMpsTableGuid                ## SOMETIMES_CONSUMES ## SystemTable\r

-  gEfiSalSystemTableGuid          ## SOMETIMES_CONSUMES ## SystemTable\r

   gEfiAcpi10TableGuid             ## SOMETIMES_CONSUMES ## SystemTable\r
   gEfiAcpi20TableGuid             ## SOMETIMES_CONSUMES ## SystemTable\r
   gShellDebug1HiiGuid             ## SOMETIMES_CONSUMES ## HII\r
   gEfiAcpi10TableGuid             ## SOMETIMES_CONSUMES ## SystemTable\r
   gEfiAcpi20TableGuid             ## SOMETIMES_CONSUMES ## SystemTable\r
   gShellDebug1HiiGuid             ## SOMETIMES_CONSUMES ## HII\r