UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / ArmPkg / Include / AsmMacroIoLibV8.h

diff --git a/ArmPkg/Include/AsmMacroIoLibV8.h b/ArmPkg/Include/AsmMacroIoLibV8.h
index db43d3b52e5a0ab80e509d48bef22110110f0685..2c2b1cabd053767107d475cae85de6b67d75869b 100644 (file)
--- a/ArmPkg/Include/AsmMacroIoLibV8.h
+++ b/ArmPkg/Include/AsmMacroIoLibV8.h
@@ -5,19 +5,12 @@
   Portions copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>\r
   Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>\r
 \r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
-\r
-#ifndef __MACRO_IO_LIBV8_H__\r
-#define __MACRO_IO_LIBV8_H__\r
+#ifndef ASM_MACRO_IO_LIBV8_H_\r
+#define ASM_MACRO_IO_LIBV8_H_\r
 \r
 // CurrentEL : 0xC = EL3; 8 = EL2; 4 = EL1\r
 // This only selects between EL1 and EL2, else we die.\r
@@ -30,7 +23,6 @@
         cbnz   SAFE_XREG, 1f        ;\\r
         b      .                    ;// We should never get here\r
 \r
-\r
 // CurrentEL : 0xC = EL3; 8 = EL2; 4 = EL1\r
 // This only selects between EL1 and EL2 and EL3, else we die.\r
 // Provide the Macro with a safe temp xreg to use.\r
@@ -48,7 +40,7 @@
   .type     Name, %function       ; \\r
   Name:\r
 \r
-#define ASM_FUNC(Name)            _ASM_FUNC(ASM_PFX(Name), .text. ## Name)\r
+#define ASM_FUNC(Name)  _ASM_FUNC(ASM_PFX(Name), .text. ## Name)\r
 \r
 #define MOV32(Reg, Val)                   \\r
   movz      Reg, (Val) >> 16, lsl #16   ; \\r
@@ -60,4 +52,4 @@
   movk      Reg, ((Val) >> 16) & 0xffff, lsl #16  ; \\r
   movk      Reg, (Val) & 0xffff\r
 \r
-#endif // __MACRO_IO_LIBV8_H__\r
+#endif // ASM_MACRO_IO_LIBV8_H_\r