ArmPlatformPkg: Remove RVCT support

RVCT is obsolete and no longer used.
Remove support for it.

Signed-off-by: Rebecca Cran <quic_rcran@quicinc.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

4 files changed, 0 insertions, 182 deletions

diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
deleted file mode 100644
index 1c305f8b50..0000000000
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
+++ /dev/null
@@ -1,62 +0,0 @@
-//

-//  Copyright (c) 2012-2013, ARM Limited. All rights reserved.

-//

-//  SPDX-License-Identifier: BSD-2-Clause-Patent

-//

-//

-

-#include <Library/ArmLib.h>

-

-  INCLUDE AsmMacroIoLib.inc

-

-  EXPORT  ArmPlatformPeiBootAction

-  EXPORT  ArmPlatformGetCorePosition

-  EXPORT  ArmPlatformGetPrimaryCoreMpId

-  EXPORT  ArmPlatformIsPrimaryCore

-

-  IMPORT  _gPcd_FixedAtBuild_PcdArmPrimaryCore

-  IMPORT  _gPcd_FixedAtBuild_PcdArmPrimaryCoreMask

-

-  PRESERVE8

-  AREA    ArmPlatformNullHelper, CODE, READONLY

-

-ArmPlatformPeiBootAction FUNCTION

-  bx    lr

-  ENDFUNC

-

-//UINTN

-//ArmPlatformGetCorePosition (

-//  IN UINTN MpId

-//  );

-ArmPlatformGetCorePosition FUNCTION

-  and   r1, r0, #ARM_CORE_MASK

-  and   r0, r0, #ARM_CLUSTER_MASK

-  add   r0, r1, r0, LSR #7

-  bx    lr

-  ENDFUNC

-

-//UINTN

-//ArmPlatformGetPrimaryCoreMpId (

-//  VOID

-//  );

-ArmPlatformGetPrimaryCoreMpId FUNCTION

-  mov32 r0, FixedPcdGet32(PcdArmPrimaryCore)

-  bx    lr

-  ENDFUNC

-

-//UINTN

-//ArmPlatformIsPrimaryCore (

-//  IN UINTN MpId

-//  );

-ArmPlatformIsPrimaryCore FUNCTION

-  mov32 r1, FixedPcdGet32(PcdArmPrimaryCoreMask)

-  and   r0, r0, r1

-  mov32 r1, FixedPcdGet32(PcdArmPrimaryCore)

-  cmp   r0, r1

-  moveq r0, #1

-  movne r0, #0

-  bx    lr

-  ENDFUNC

-

-  END

-

diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
index e0d0028d82..4a1cd97e35 100644
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
@@ -29,7 +29,6 @@
 

 [Sources.Arm]

   Arm/ArmPlatformHelper.S    | GCC

-  Arm/ArmPlatformHelper.asm  | RVCT

 

 [Sources.AArch64]

   AArch64/ArmPlatformHelper.S

diff --git a/ArmPlatformPkg/Library/ArmPlatformStackLib/Arm/ArmPlatformStackLib.asm b/ArmPlatformPkg/Library/ArmPlatformStackLib/Arm/ArmPlatformStackLib.asm
deleted file mode 100644
index 2c346146d0..0000000000
--- a/ArmPlatformPkg/Library/ArmPlatformStackLib/Arm/ArmPlatformStackLib.asm
+++ /dev/null
@@ -1,118 +0,0 @@
-//

-//  Copyright (c) 2012-2013, ARM Limited. All rights reserved.

-//

-//  SPDX-License-Identifier: BSD-2-Clause-Patent

-//

-//

-

-#include <AutoGen.h>

-

-  INCLUDE AsmMacroIoLib.inc

-

-  EXPORT  ArmPlatformStackSet

-  EXPORT  ArmPlatformStackSetPrimary

-  EXPORT  ArmPlatformStackSetSecondary

-

-  IMPORT  ArmPlatformIsPrimaryCore

-  IMPORT  ArmPlatformGetCorePosition

-  IMPORT  ArmPlatformGetPrimaryCoreMpId

-

-  IMPORT  _gPcd_FixedAtBuild_PcdCoreCount

-

-  PRESERVE8

-  AREA    ArmPlatformStackLib, CODE, READONLY

-

-//VOID

-//ArmPlatformStackSet (

-//  IN UINTN StackBase,

-//  IN UINTN MpId,

-//  IN UINTN PrimaryStackSize,

-//  IN UINTN SecondaryStackSize

-//  );

-ArmPlatformStackSet FUNCTION

-  // Save parameters

-  mov   r6, r3

-  mov   r5, r2

-  mov   r4, r1

-  mov   r3, r0

-

-  // Save the Link register

-  mov   r7, lr

-

-  // Identify Stack

-  mov   r0, r1

-  bl    ArmPlatformIsPrimaryCore

-  cmp   r0, #1

-

-  // Restore parameters

-  mov   r0, r3

-  mov   r1, r4

-  mov   r2, r5

-  mov   r3, r6

-

-  // Restore the Link register

-  mov   lr, r7

-

-  beq   ArmPlatformStackSetPrimary

-  bne   ArmPlatformStackSetSecondary

-  ENDFUNC

-

-//VOID

-//ArmPlatformStackSetPrimary (

-//  IN UINTN StackBase,

-//  IN UINTN MpId,

-//  IN UINTN PrimaryStackSize,

-//  IN UINTN SecondaryStackSize

-//  );

-ArmPlatformStackSetPrimary FUNCTION

-  mov   r4, lr

-

-  // Add stack of primary stack to StackBase

-  add   r0, r0, r2

-

-  // Compute SecondaryCoresCount * SecondaryCoreStackSize

-  mov32 r1, FixedPcdGet32 (PcdCoreCount)

-  sub   r1, #1

-  mul   r3, r3, r1

-

-  // Set Primary Stack ((StackBase + PrimaryStackSize) + (SecondaryCoresCount * SecondaryCoreStackSize))

-  add   sp, r0, r3

-

-  bx    r4

-  ENDFUNC

-

-//VOID

-//ArmPlatformStackSetSecondary (

-//  IN UINTN StackBase,

-//  IN UINTN MpId,

-//  IN UINTN PrimaryStackSize,

-//  IN UINTN SecondaryStackSize

-//  );

-ArmPlatformStackSetSecondary FUNCTION

-  mov   r4, lr

-  mov   sp, r0

-

-  // Get Core Position

-  mov   r0, r1

-  bl ArmPlatformGetCorePosition

-  mov   r5, r0

-

-  // Get Primary Core Position

-  bl ArmPlatformGetPrimaryCoreMpId

-  bl ArmPlatformGetCorePosition

-

-  // Get Secondary Core Position. We should get consecutive secondary stack number from 1...(CoreCount-1)

-  cmp   r5, r0

-  subhi r5, r5, #1

-  add   r5, r5, #1

-

-  // Compute top of the secondary stack

-  mul   r3, r3, r5

-

-  // Set stack

-  add   sp, sp, r3

-

-  bx r4

-  ENDFUNC

-

-  END

diff --git a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf b/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
index 76f809c80d..dfa0e7b9e7 100644
--- a/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
+++ b/ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
@@ -21,7 +21,6 @@
   ArmPlatformPkg/ArmPlatformPkg.dec

 

 [Sources.ARM]

-  Arm/ArmPlatformStackLib.asm     | RVCT

   Arm/ArmPlatformStackLib.S       | GCC

 

 [Sources.AARCH64]