ArmPlatformPkg/ArmVExpressDxe: remove unused cruft from ArmHwDxe

Remove unused cruft from ArmHwDxe -- the only thing that remains is
installation of the 'runaxf' shell command.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Tested-by: Ryan Harkin <ryan.harkin@linaro.org>

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c
index 351c73312dc49cf25a93895774ba84f72ccfa708..19efa3c23dea11331a3ed4a8c1f31381dc09d08f 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c
@@ -12,49 +12,8 @@
 \r
 **/\r
 \r
-#include "ArmVExpressInternal.h"\r
 #include <Library/ArmShellCmdLib.h>\r
-\r
-CONST EFI_GUID ArmHwA9x4Guid = { 0x2fd21cf6, 0xe6e8, 0x4ff2, { 0xa9, 0xca, 0x3b, 0x9f, 0x00, 0xe9, 0x28, 0x89 } };\r
-CONST EFI_GUID ArmHwA15x2A7x3Guid = { 0xd5e606eb, 0x83df, 0x4e90, { 0x81, 0xe8, 0xc3, 0xdb, 0x2f, 0x77, 0x17, 0x9a } };\r
-CONST EFI_GUID ArmHwA15Guid = { 0x6b8947c2, 0x4287, 0x4d91, { 0x8f, 0xe0, 0xa3, 0x81, 0xea, 0x5b, 0x56, 0x8f } };\r
-CONST EFI_GUID ArmHwA5Guid = { 0xa2cc7663, 0x4d7c, 0x448a, { 0xaa, 0xb5, 0x4c, 0x03, 0x4b, 0x6f, 0xda, 0xb7 } };\r
-CONST EFI_GUID NullGuid = { 0x0, 0x0, 0x0, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } };\r
-\r
-//\r
-// Description of the four hardware platforms :\r
-// just the platform id for the time being.\r
-// Platform ids are defined in ArmVExpressInternal.h for\r
-// all "ArmVExpress-like" platforms (AARCH64 or ARM architecture,\r
-// model or hardware platforms).\r
-//\r
-//Note: File extensions are stripped with the VExpress NOR Flash FileSystem\r
-CONST ARM_VEXPRESS_PLATFORM ArmVExpressPlatforms[] = {\r
-  { ARM_HW_A9x4, &ArmHwA9x4Guid, L"ca9" },\r
-  { ARM_HW_A15x2_A7x3, &ArmHwA15x2A7x3Guid, L"ca15a7" },\r
-  { ARM_HW_A15, &ArmHwA15Guid, L"ca15a7" },\r
-  { ARM_HW_A5, &ArmHwA5Guid, L"ca5s" },\r
-  { ARM_FVP_VEXPRESS_UNKNOWN, &NullGuid, NULL }\r
-};\r
-\r
-/**\r
-  Get information about the VExpress platform the firmware is running on.\r
-\r
-  @param[out]  Platform   Address where the pointer to the platform information\r
-                          (type ARM_VEXPRESS_PLATFORM*) should be stored.\r
-                          The returned pointer does not point to an allocated\r
-                          memory area. Not used here.\r
-\r
-  @retval  EFI_NOT_FOUND  The platform was not recognised.\r
-\r
-**/\r
-EFI_STATUS\r
-ArmVExpressGetPlatform (\r
-  OUT CONST ARM_VEXPRESS_PLATFORM** Platform\r
-  )\r
-{\r
-  return EFI_NOT_FOUND;\r
-}\r
+#include <Library/DebugLib.h>\r
 \r
 /**\r
  * Generic UEFI Entrypoint for 'ArmHwDxe' driver\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf
index 1a007627ad3f277b12f717b7d862c69844997633..1ecdbb0b231e02f05fbd0c28ee0703f73b9ebf38 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf
@@ -22,12 +22,9 @@
 \r
 [Sources.common]\r
   ArmHwDxe.c\r
-  ArmVExpressCommon.c\r
 \r
 [Packages]\r
-  ArmPkg/ArmPkg.dec\r
   ArmPlatformPkg/ArmPlatformPkg.dec\r
-  EmbeddedPkg/EmbeddedPkg.dec\r
   MdePkg/MdePkg.dec\r
 \r
 [LibraryClasses]\r