diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-08-10 14:09:56 +0200 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-08-11 12:29:31 +0200 |
| commit | 5e32710023e2af6bf86aa946cafa3e0cfed16bbe (patch) | |
| tree | 0b4c26dd90c7128dae703cfa63dc280c7f702816 /ArmPkg/Library/ArmSmcLibNull | |
| parent | dfc2838892e4a69781b06353ef494ba3ddf16488 (diff) | |
| download | edk2-5e32710023e2af6bf86aa946cafa3e0cfed16bbe.tar.gz edk2-5e32710023e2af6bf86aa946cafa3e0cfed16bbe.tar.bz2 edk2-5e32710023e2af6bf86aa946cafa3e0cfed16bbe.zip | |
ArmPkg/ArmSmcLibNull: move to generic C implementation
The C language is powerful enough to implement a function that does
absolutely nothing, so there is no need to resort to implementations
in assembler for various toolchains/architectures.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Diffstat (limited to 'ArmPkg/Library/ArmSmcLibNull')
| -rw-r--r-- | ArmPkg/Library/ArmSmcLibNull/Arm/ArmSmcNull.S | 20 | ||||
| -rw-r--r-- | ArmPkg/Library/ArmSmcLibNull/Arm/ArmSmcNull.asm | 20 | ||||
| -rw-r--r-- | ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.c (renamed from ArmPkg/Library/ArmSmcLibNull/AArch64/ArmSmcNull.S) | 42 | ||||
| -rw-r--r-- | ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf | 8 |
4 files changed, 24 insertions, 66 deletions
diff --git a/ArmPkg/Library/ArmSmcLibNull/Arm/ArmSmcNull.S b/ArmPkg/Library/ArmSmcLibNull/Arm/ArmSmcNull.S deleted file mode 100644 index 9eaefd30cf..0000000000 --- a/ArmPkg/Library/ArmSmcLibNull/Arm/ArmSmcNull.S +++ /dev/null @@ -1,20 +0,0 @@ -//
-// Copyright (c) 2012-2014, ARM Limited. All rights reserved.
-//
-// This program and the accompanying materials
-// are licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-//
-//
-
-.text
-.align 3
-
-GCC_ASM_EXPORT(ArmCallSmc)
-
-ASM_PFX(ArmCallSmc):
- bx lr
diff --git a/ArmPkg/Library/ArmSmcLibNull/Arm/ArmSmcNull.asm b/ArmPkg/Library/ArmSmcLibNull/Arm/ArmSmcNull.asm deleted file mode 100644 index 3dcb25fa22..0000000000 --- a/ArmPkg/Library/ArmSmcLibNull/Arm/ArmSmcNull.asm +++ /dev/null @@ -1,20 +0,0 @@ -//
-// Copyright (c) 2012-2014, ARM Limited. All rights reserved.
-//
-// This program and the accompanying materials
-// are licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-//
-//
-
-
- INCLUDE AsmMacroExport.inc
-
- RVCT_ASM_EXPORT ArmCallSmc
- bx lr
-
- END
diff --git a/ArmPkg/Library/ArmSmcLibNull/AArch64/ArmSmcNull.S b/ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.c index a6ef0e04da..e5d4e51133 100644 --- a/ArmPkg/Library/ArmSmcLibNull/AArch64/ArmSmcNull.S +++ b/ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.c @@ -1,20 +1,22 @@ -//
-// Copyright (c) 2012-2014, ARM Limited. All rights reserved.
-//
-// This program and the accompanying materials
-// are licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-//
-//
-
-.text
-.align 3
-
-GCC_ASM_EXPORT(ArmCallSmc)
-
-ASM_PFX(ArmCallSmc):
- ret
+// +// Copyright (c) 2016, Linaro Limited. All rights reserved. +// +// This program and the accompanying materials +// are licensed and made available under the terms and conditions of the BSD License +// which accompanies this distribution. The full text of the license may be found at +// http://opensource.org/licenses/bsd-license.php +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// + +#include <Base.h> +#include <Library/ArmSmcLib.h> + +VOID +ArmCallSmc ( + IN OUT ARM_SMC_ARGS *Args + ) +{ +} diff --git a/ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf b/ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf index 6d75c28afb..db15a5f8bb 100644 --- a/ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf +++ b/ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf @@ -22,12 +22,8 @@ VERSION_STRING = 1.0
LIBRARY_CLASS = ArmSmcLib
-[Sources.ARM]
- Arm/ArmSmcNull.asm | RVCT
- Arm/ArmSmcNull.S | GCC
-
-[Sources.AARCH64]
- AArch64/ArmSmcNull.S
+[Sources]
+ ArmSmcLibNull.c
[Packages]
MdePkg/MdePkg.dec
|