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>

5 files changed, 0 insertions, 210 deletions

diff --git a/ArmPlatformPkg/PrePeiCore/Arm/Exception.asm b/ArmPlatformPkg/PrePeiCore/Arm/Exception.asm
deleted file mode 100644
index 28d625e67a..0000000000
--- a/ArmPlatformPkg/PrePeiCore/Arm/Exception.asm
+++ /dev/null
@@ -1,83 +0,0 @@
-//

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

-//

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

-//

-//

-

-#include <AutoGen.h>

-

-  IMPORT  PeiCommonExceptionEntry

-  EXPORT  PeiVectorTable

-

-  PRESERVE8

-  AREA    PrePeiCoreException, CODE, READONLY, CODEALIGN, ALIGN=5

-

-//============================================================

-//Default Exception Handlers

-//============================================================

-

-

-PeiVectorTable

-  b _DefaultResetHandler

-  b _DefaultUndefined

-  b _DefaultSWI

-  b _DefaultPrefetchAbort

-  b _DefaultDataAbort

-  b _DefaultReserved

-  b _DefaultIrq

-  b _DefaultFiq

-

-//

-// Default Exception handlers: There is no plan to return from any of these exceptions.

-// No context saving at all.

-//

-_DefaultResetHandler

-   mov  r1, lr

-   cps       #0x13                     ; Switch to SVC for common stack

-   mov  r0, #0

-   blx   PeiCommonExceptionEntry

-

-_DefaultUndefined

-   sub  r1, LR, #4

-   cps       #0x13                     ; Switch to SVC for common stack

-   mov  r0, #1

-   blx   PeiCommonExceptionEntry

-

-_DefaultSWI

-   sub  r1, LR, #4

-   cps       #0x13                     ; Switch to SVC for common stack

-   mov  r0, #2

-   blx   PeiCommonExceptionEntry

-

-_DefaultPrefetchAbort

-   sub  r1, LR, #4

-   cps       #0x13                     ; Switch to SVC for common stack

-   mov  r0, #3

-   blx   PeiCommonExceptionEntry

-

-_DefaultDataAbort

-   sub  r1, LR, #8

-   cps       #0x13                     ; Switch to SVC for common stack

-   mov  r0, #4

-   blx   PeiCommonExceptionEntry

-

-_DefaultReserved

-   mov  r1, lr

-   cps       #0x13                     ; Switch to SVC for common stack

-   mov  r0, #5

-   blx   PeiCommonExceptionEntry

-

-_DefaultIrq

-   sub  r1, LR, #4

-   cps       #0x13                     ; Switch to SVC for common stack

-   mov  r0, #6

-   blx   PeiCommonExceptionEntry

-

-_DefaultFiq

-   sub  r1, LR, #4

-   cps       #0x13                     ; Switch to SVC for common stack

-   mov  r0, #7

-   blx   PeiCommonExceptionEntry

-

-  END

diff --git a/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm b/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm
deleted file mode 100644
index 2734b0951a..0000000000
--- a/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm
+++ /dev/null
@@ -1,89 +0,0 @@
-//

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

-//

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

-//

-//

-

-#include <AutoGen.h>

-

-  INCLUDE AsmMacroIoLib.inc

-

-  IMPORT  CEntryPoint

-  IMPORT  ArmPlatformGetCorePosition

-  IMPORT  ArmPlatformIsPrimaryCore

-  IMPORT  ArmReadMpidr

-  IMPORT  ArmPlatformPeiBootAction

-  EXPORT  _ModuleEntryPoint

-

-  PRESERVE8

-  AREA    PrePeiCoreEntryPoint, CODE, READONLY

-

-StartupAddr        DCD      CEntryPoint

-

-_ModuleEntryPoint

-  // Do early platform specific actions

-  bl    ArmPlatformPeiBootAction

-

-  // Identify CPU ID

-  bl    ArmReadMpidr

-  // Keep a copy of the MpId register value

-  mov   r5, r0

-

-  // Is it the Primary Core ?

-  bl    ArmPlatformIsPrimaryCore

-

-  // Get the top of the primary stacks (and the base of the secondary stacks)

-  mov32 r1, FixedPcdGet64(PcdCPUCoresStackBase) + FixedPcdGet32(PcdCPUCorePrimaryStackSize)

-

-  // r0 is equal to 1 if I am the primary core

-  cmp   r0, #1

-  beq   _SetupPrimaryCoreStack

-

-_SetupSecondaryCoreStack

-  // r1 contains the base of the secondary stacks

-

-  // Get the Core Position

-  mov   r6, r1      // Save base of the secondary stacks

-  mov   r0, r5

-  bl    ArmPlatformGetCorePosition

-  // The stack starts at the top of the stack region. Add '1' to the Core Position to get the top of the stack

-  add   r0, r0, #1

-

-  // StackOffset = CorePos * StackSize

-  mov32 r2, FixedPcdGet32(PcdCPUCoreSecondaryStackSize)

-  mul   r0, r0, r2

-  // SP = StackBase + StackOffset

-  add   sp, r6, r0

-

-_PrepareArguments

-  // The PEI Core Entry Point has been computed by GenFV and stored in the second entry of the Reset Vector

-  mov32 r2, FixedPcdGet32(PcdFvBaseAddress)

-  ldr   r1, [r2, #4]

-

-  // Move sec startup address into a data register

-  // Ensure we're jumping to FV version of the code (not boot remapped alias)

-  ldr   r3, StartupAddr

-

-  // Jump to PrePeiCore C code

-  //    r0 = mp_id

-  //    r1 = pei_core_address

-  mov   r0, r5

-  blx   r3

-

-_SetupPrimaryCoreStack

-  mov   sp, r1

-  mov32 r8, FixedPcdGet64 (PcdCPUCoresStackBase)

-  mov32 r9, FixedPcdGet32 (PcdInitValueInTempStack)

-  mov   r10, r9

-  mov   r11, r9

-  mov   r12, r9

-0:stm   r8!, {r9-r12}

-  cmp   r8, r1

-  blt   0b

-  b     _PrepareArguments

-

-_NeverReturn

-  b _NeverReturn

-

-  END

diff --git a/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.asm b/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.asm
deleted file mode 100644
index 65f64805a0..0000000000
--- a/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.asm
+++ /dev/null
@@ -1,32 +0,0 @@
-;------------------------------------------------------------------------------

-;

-; Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>

-; Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

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

-;

-;------------------------------------------------------------------------------

-

-    EXPORT SecSwitchStack

-

-    AREA   Switch_Stack, CODE, READONLY

-

-;/**

-;  This allows the caller to switch the stack and return

-;

-; @param      StackDelta     Signed amount by which to modify the stack pointer

-;

-; @return     Nothing. Goes to the Entry Point passing in the new parameters

-;

-;**/

-;VOID

-;EFIAPI

-;SecSwitchStack (

-;  VOID  *StackDelta

-;  );

-;

-SecSwitchStack

-    MOV   R1, SP

-    ADD   R1, R0, R1

-    MOV   SP, R1

-    BX    LR

-    END

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
index fb01dd1a11..a5b4722459 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
@@ -21,11 +21,8 @@
 

 [Sources.ARM]

   Arm/ArchPrePeiCore.c

-  Arm/PrePeiCoreEntryPoint.asm | RVCT

   Arm/PrePeiCoreEntryPoint.S   | GCC

-  Arm/SwitchStack.asm      | RVCT

   Arm/SwitchStack.S        | GCC

-  Arm/Exception.asm        | RVCT

   Arm/Exception.S          | GCC

 

 [Sources.AARCH64]

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
index e9eb092d3a..466a2b01c3 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
@@ -21,11 +21,8 @@
 

 [Sources.ARM]

   Arm/ArchPrePeiCore.c

-  Arm/PrePeiCoreEntryPoint.asm | RVCT

   Arm/PrePeiCoreEntryPoint.S   | GCC

-  Arm/SwitchStack.asm      | RVCT

   Arm/SwitchStack.S        | GCC

-  Arm/Exception.asm        | RVCT

   Arm/Exception.S          | GCC

 

 [Sources.AARCH64]