From 3402aac7d985bf8a9f9d3c639f3fe93609380513 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Tue, 19 Aug 2014 13:29:52 +0000 Subject: ARM Packages: Removed trailing spaces Trailing spaces create issue/warning when generating/applying patches. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ronald Cron Reviewed-By: Olivier Martin git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15833 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmPlatformPkg/PrePeiCore/Arm/ArchPrePeiCore.c | 14 ++++++------- ArmPlatformPkg/PrePeiCore/Arm/Exception.S | 16 +++++++-------- ArmPlatformPkg/PrePeiCore/Arm/Exception.asm | 22 ++++++++++---------- .../PrePeiCore/Arm/PrePeiCoreEntryPoint.S | 16 +++++++-------- .../PrePeiCore/Arm/PrePeiCoreEntryPoint.asm | 24 +++++++++++----------- ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.S | 14 ++++++------- ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.asm | 10 ++++----- ArmPlatformPkg/PrePeiCore/PrePeiCore.c | 2 +- ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf | 22 ++++++++++---------- ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf | 22 ++++++++++---------- 10 files changed, 81 insertions(+), 81 deletions(-) (limited to 'ArmPlatformPkg/PrePeiCore') diff --git a/ArmPlatformPkg/PrePeiCore/Arm/ArchPrePeiCore.c b/ArmPlatformPkg/PrePeiCore/Arm/ArchPrePeiCore.c index b0594ae2cd..6a250391b4 100644 --- a/ArmPlatformPkg/PrePeiCore/Arm/ArchPrePeiCore.c +++ b/ArmPlatformPkg/PrePeiCore/Arm/ArchPrePeiCore.c @@ -2,14 +2,14 @@ * Main file supporting the transition to PEI Core in Normal World for Versatile Express * * Copyright (c) 2012, 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. +* 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. * **/ diff --git a/ArmPlatformPkg/PrePeiCore/Arm/Exception.S b/ArmPlatformPkg/PrePeiCore/Arm/Exception.S index abce21d0a5..afd284a2c7 100644 --- a/ArmPlatformPkg/PrePeiCore/Arm/Exception.S +++ b/ArmPlatformPkg/PrePeiCore/Arm/Exception.S @@ -1,13 +1,13 @@ // // Copyright (c) 2011, 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 +// +# 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. +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # # @@ -28,8 +28,8 @@ GCC_ASM_EXPORT(PeiVectorTable) //============================================================ //Default Exception Handlers //============================================================ - - + + ASM_PFX(PeiVectorTable): b _DefaultResetHandler b _DefaultUndefined diff --git a/ArmPlatformPkg/PrePeiCore/Arm/Exception.asm b/ArmPlatformPkg/PrePeiCore/Arm/Exception.asm index 55bd4af1dd..de438f913a 100644 --- a/ArmPlatformPkg/PrePeiCore/Arm/Exception.asm +++ b/ArmPlatformPkg/PrePeiCore/Arm/Exception.asm @@ -1,13 +1,13 @@ // // Copyright (c) 2011, 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. +// 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. // // @@ -17,15 +17,15 @@ IMPORT PeiCommonExceptionEntry EXPORT PeiVectorTable - + PRESERVE8 AREA PrePeiCoreException, CODE, READONLY, CODEALIGN, ALIGN=5 //============================================================ //Default Exception Handlers //============================================================ - - + + PeiVectorTable b _DefaultResetHandler b _DefaultUndefined @@ -75,7 +75,7 @@ _DefaultReserved 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 diff --git a/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.S b/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.S index af4350b0cb..a6f19aff0f 100644 --- a/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.S +++ b/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.S @@ -1,13 +1,13 @@ // // Copyright (c) 2011-2013, 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. +// 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. // // @@ -74,7 +74,7 @@ _PrepareArguments: // 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 diff --git a/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm b/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm index be1a767696..9ac7500f19 100644 --- a/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm +++ b/ArmPlatformPkg/PrePeiCore/Arm/PrePeiCoreEntryPoint.asm @@ -1,13 +1,13 @@ // // Copyright (c) 2011-2013, 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. +// 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. // // @@ -17,17 +17,17 @@ #include INCLUDE AsmMacroIoLib.inc - + IMPORT CEntryPoint IMPORT ArmPlatformGetCorePosition IMPORT ArmPlatformIsPrimaryCore IMPORT ArmReadMpidr IMPORT ArmPlatformPeiBootAction EXPORT _ModuleEntryPoint - + PRESERVE8 AREA PrePeiCoreEntryPoint, CODE, READONLY - + StartupAddr DCD CEntryPoint _ModuleEntryPoint @@ -38,7 +38,7 @@ _ModuleEntryPoint bl ArmReadMpidr // Keep a copy of the MpId register value mov r5, r0 - + // Is it the Primary Core ? bl ArmPlatformIsPrimaryCore @@ -76,7 +76,7 @@ _PrepareArguments // 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 diff --git a/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.S b/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.S index 2543f58414..509dc205d9 100644 --- a/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.S +++ b/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.S @@ -1,4 +1,4 @@ -#------------------------------------------------------------------------------ +#------------------------------------------------------------------------------ # # Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
# Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
@@ -11,14 +11,14 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # #------------------------------------------------------------------------------ - + .text .align 3 GCC_ASM_EXPORT(SecSwitchStack) - + #/** # This allows the caller to switch the stack and return # @@ -33,11 +33,11 @@ GCC_ASM_EXPORT(SecSwitchStack) # VOID *StackDelta # )# # -ASM_PFX(SecSwitchStack): +ASM_PFX(SecSwitchStack): mov R1, R13 add R1, R0, R1 mov R13, R1 bx LR - - - + + + diff --git a/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.asm b/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.asm index 10da81d6ac..cb1308feab 100644 --- a/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.asm +++ b/ArmPlatformPkg/PrePeiCore/Arm/SwitchStack.asm @@ -1,4 +1,4 @@ -;------------------------------------------------------------------------------ +;------------------------------------------------------------------------------ ; ; Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
; Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
@@ -11,11 +11,11 @@ ; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. ; ;------------------------------------------------------------------------------ - + EXPORT SecSwitchStack - + AREA Switch_Stack, CODE, READONLY - + ;/** ; This allows the caller to switch the stack and return ; @@ -30,7 +30,7 @@ ; VOID *StackDelta ; ); ; -SecSwitchStack +SecSwitchStack MOV R1, SP ADD R1, R0, R1 MOV SP, R1 diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c index f33f376cf1..93d7e1c4c0 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c @@ -141,7 +141,7 @@ PrePeiCoreTemporaryRamSupport ( // Migrate the temporary memory heap to permanent memory heap. // CopyMem (NewHeap, OldHeap, CopySize >> 1); - + SecSwitchStack ((UINTN)NewStack - (UINTN)OldStack); return EFI_SUCCESS; diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf index 3b441d4439..96a542deb6 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf @@ -1,16 +1,16 @@ #/** @file # Pre PeiCore - Hand-off to PEI Core in Normal World -# +# # Copyright (c) 2011-2012, 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. -# +# 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. +# #**/ [Defines] @@ -74,9 +74,9 @@ gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize - + gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize - + gArmTokenSpaceGuid.PcdGicDistributorBase gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase gArmTokenSpaceGuid.PcdGicSgiIntId diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf index f50d21fa6e..ecef43231d 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf @@ -1,16 +1,16 @@ #/** @file # Pre PeiCore - Hand-off to PEI Core in Normal World -# +# # Copyright (c) 2011, 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. -# +# 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. +# #**/ [Defines] @@ -70,8 +70,8 @@ gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize - + gArmPlatformTokenSpaceGuid.PcdPeiGlobalVariableSize - + gArmTokenSpaceGuid.PcdGicDistributorBase gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase -- cgit v1.2.3