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>

ArmPkg/Library/ArmSmcLibNull/Arm/ArmSmcNull.S

@@ -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

ArmPkg/Library/ArmSmcLibNull/Arm/ArmSmcNull.asm

@@ -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

ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.c

@@ -1,20 +1,22 @@
-//
+//
-//  Copyright (c) 2012-2014, ARM Limited. All rights reserved.
+//  Copyright (c) 2016, Linaro Limited. All rights reserved.
-//
+//
-//  This program and the accompanying materials
+//  This program and the accompanying materials
-//  are licensed and made available under the terms and conditions of the BSD License
+//  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
+//  which accompanies this distribution.  The full text of the license may be found at
-//  http://opensource.org/licenses/bsd-license.php
+//  http://opensource.org/licenses/bsd-license.php
-//
+//
-//  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+//  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+//  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-//
+//
-//
+//
-
+
-.text
+#include <Base.h>
-.align 3
+#include <Library/ArmSmcLib.h>
-
+
-GCC_ASM_EXPORT(ArmCallSmc)
+VOID
-
+ArmCallSmc (
-ASM_PFX(ArmCallSmc):
+  IN OUT ARM_SMC_ARGS *Args
-  ret
+  )
+{
+}

ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf

@@ -22,12 +22,8 @@
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = ArmSmcLib
 
-[Sources.ARM]
+[Sources]
-  Arm/ArmSmcNull.asm    | RVCT
+  ArmSmcLibNull.c
-  Arm/ArmSmcNull.S      | GCC
-
-[Sources.AARCH64]
-  AArch64/ArmSmcNull.S
 
 [Packages]
   MdePkg/MdePkg.dec