From 35d9b7ea2d46f784365c14eb293fcd802a2bafff Mon Sep 17 00:00:00 2001
From: Rebecca Cran <quic_rcran@quicinc.com>
Date: Wed, 4 May 2022 02:48:11 +0800
Subject: ArmPkg: 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>
---
 ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.asm | 45 ---------------------------------
 ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf  |  4 ---
 2 files changed, 49 deletions(-)
 delete mode 100644 ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.asm

(limited to 'ArmPkg/Library/ArmSmcLib')

diff --git a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.asm b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.asm
deleted file mode 100644
index d14573c9cc..0000000000
--- a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.asm
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  Copyright (c) 2012-2014, ARM Limited. All rights reserved.
-//
-//  SPDX-License-Identifier: BSD-2-Clause-Patent
-//
-//
-
-
-    INCLUDE AsmMacroExport.inc
-
- RVCT_ASM_EXPORT ArmCallSmc
-    push    {r4-r8}
-    // r0 will be popped just after the SMC call
-    push     {r0}
-
-    // Load the SMC arguments values into the appropriate registers
-    ldr     r7, [r0, #28]
-    ldr     r6, [r0, #24]
-    ldr     r5, [r0, #20]
-    ldr     r4, [r0, #16]
-    ldr     r3, [r0, #12]
-    ldr     r2, [r0, #8]
-    ldr     r1, [r0, #4]
-    ldr     r0, [r0, #0]
-
-    smc     #0
-
-    // Pop the ARM_SMC_ARGS structure address from the stack into r8
-    pop     {r8}
-
-    // Load the SMC returned values into the appropriate registers
-    // A SMC call can return up to 4 values - we do not need to store back r4-r7.
-    str     r3, [r8, #12]
-    str     r2, [r8, #8]
-    str     r1, [r8, #4]
-    str     r0, [r8, #0]
-
-    mov     r0, r8
-
-    // Restore the registers r4-r8
-    pop     {r4-r8}
-
-    bx      lr
-
-    END
diff --git a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
index a89f9203fb..6ce0ea4caf 100644
--- a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+++ b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
@@ -14,7 +14,6 @@
   LIBRARY_CLASS                  = ArmSmcLib
 
 [Sources.ARM]
-  Arm/ArmSmc.asm    | RVCT
   Arm/ArmSmc.S      | GCC
 
 [Sources.AARCH64]
@@ -26,6 +25,3 @@
 [Packages]
   MdePkg/MdePkg.dec
   ArmPkg/ArmPkg.dec
-
-[BuildOptions]
-  RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu 7-A.security
-- 
cgit v1.2.3