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>

2 files changed, 1 insertions, 45 deletions

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c
index 351c73312d..19efa3c23d 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c
@@ -12,49 +12,8 @@
 

 **/

 

-#include "ArmVExpressInternal.h"

 #include <Library/ArmShellCmdLib.h>

-

-CONST EFI_GUID ArmHwA9x4Guid = { 0x2fd21cf6, 0xe6e8, 0x4ff2, { 0xa9, 0xca, 0x3b, 0x9f, 0x00, 0xe9, 0x28, 0x89 } };

-CONST EFI_GUID ArmHwA15x2A7x3Guid = { 0xd5e606eb, 0x83df, 0x4e90, { 0x81, 0xe8, 0xc3, 0xdb, 0x2f, 0x77, 0x17, 0x9a } };

-CONST EFI_GUID ArmHwA15Guid = { 0x6b8947c2, 0x4287, 0x4d91, { 0x8f, 0xe0, 0xa3, 0x81, 0xea, 0x5b, 0x56, 0x8f } };

-CONST EFI_GUID ArmHwA5Guid = { 0xa2cc7663, 0x4d7c, 0x448a, { 0xaa, 0xb5, 0x4c, 0x03, 0x4b, 0x6f, 0xda, 0xb7 } };

-CONST EFI_GUID NullGuid = { 0x0, 0x0, 0x0, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } };

-

-//

-// Description of the four hardware platforms :

-// just the platform id for the time being.

-// Platform ids are defined in ArmVExpressInternal.h for

-// all "ArmVExpress-like" platforms (AARCH64 or ARM architecture,

-// model or hardware platforms).

-//

-//Note: File extensions are stripped with the VExpress NOR Flash FileSystem

-CONST ARM_VEXPRESS_PLATFORM ArmVExpressPlatforms[] = {

-  { ARM_HW_A9x4, &ArmHwA9x4Guid, L"ca9" },

-  { ARM_HW_A15x2_A7x3, &ArmHwA15x2A7x3Guid, L"ca15a7" },

-  { ARM_HW_A15, &ArmHwA15Guid, L"ca15a7" },

-  { ARM_HW_A5, &ArmHwA5Guid, L"ca5s" },

-  { ARM_FVP_VEXPRESS_UNKNOWN, &NullGuid, NULL }

-};

-

-/**

-  Get information about the VExpress platform the firmware is running on.

-

-  @param[out]  Platform   Address where the pointer to the platform information

-                          (type ARM_VEXPRESS_PLATFORM*) should be stored.

-                          The returned pointer does not point to an allocated

-                          memory area. Not used here.

-

-  @retval  EFI_NOT_FOUND  The platform was not recognised.

-

-**/

-EFI_STATUS

-ArmVExpressGetPlatform (

-  OUT CONST ARM_VEXPRESS_PLATFORM** Platform

-  )

-{

-  return EFI_NOT_FOUND;

-}

+#include <Library/DebugLib.h>

 

 /**

  * Generic UEFI Entrypoint for 'ArmHwDxe' driver

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf
index 1a007627ad..1ecdbb0b23 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf
@@ -22,12 +22,9 @@
 

 [Sources.common]

   ArmHwDxe.c

-  ArmVExpressCommon.c

 

 [Packages]

-  ArmPkg/ArmPkg.dec

   ArmPlatformPkg/ArmPlatformPkg.dec

-  EmbeddedPkg/EmbeddedPkg.dec

   MdePkg/MdePkg.dec

 

 [LibraryClasses]