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 --- BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S | 18 +++++++-------- BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm | 34 ++++++++++++++--------------- BeagleBoardPkg/Sec/Cache.c | 8 +++---- BeagleBoardPkg/Sec/Clock.c | 2 +- BeagleBoardPkg/Sec/LzmaDecompress.h | 22 +++++++++---------- BeagleBoardPkg/Sec/PadConfiguration.c | 2 +- BeagleBoardPkg/Sec/Sec.c | 10 ++++----- BeagleBoardPkg/Sec/Sec.inf | 14 ++++++------ 8 files changed, 55 insertions(+), 55 deletions(-) (limited to 'BeagleBoardPkg/Sec') diff --git a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S index 94291fc52c..b656c1e040 100644 --- a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S +++ b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S @@ -1,4 +1,4 @@ -#------------------------------------------------------------------------------ +#------------------------------------------------------------------------------ # # Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
# @@ -27,7 +27,7 @@ ASM_PFX(_ModuleEntryPoint): mrc p15, 0, r0, c1, c0, 1 // read Auxiliary Control Register bic r0, r0, #0x00000002 // disable L2 cache mcr p15, 0, r0, c1, c0, 1 // store Auxiliary Control Register - + //Enable Strict alignment checking & Instruction cache mrc p15, 0, r0, c1, c0, 0 bic r0, r0, #0x00002300 /* clear bits 13, 9:8 (--V- --RS) */ @@ -42,8 +42,8 @@ ASM_PFX(_ModuleEntryPoint): mcr p15, 0, r0, c1, c0, 2 mov r0, #0x40000000 // Set EN bit in FPEXC mcr p10,#0x7,r0,c8,c0,#0 // msr FPEXC,r0 in ARM assembly - - + + // Set CPU vectors to start of DRAM LoadConstantToReg (FixedPcdGet32(PcdCpuVectorBaseAddress) ,r0) // Get vector base mcr p15, 0, r0, c12, c0, 0 @@ -57,14 +57,14 @@ FillVectors: adds r2, r2, #4 cmp r2, #32 bne FillVectors - + /* before we call C code, lets setup the stack pointer in internal RAM */ stack_pointer_setup: // - // Set stack based on PCD values. Need to do it this way to make C code work - // when it runs from FLASH. - // + // Set stack based on PCD values. Need to do it this way to make C code work + // when it runs from FLASH. + // LoadConstantToReg (FixedPcdGet32(PcdPrePiStackBase) ,r2) /* stack base arg2 */ LoadConstantToReg (FixedPcdGet32(PcdPrePiStackSize) ,r3) /* stack size arg3 */ add r4, r2, r3 @@ -82,4 +82,4 @@ stack_pointer_setup: ShouldNeverGetHere: /* _CEntryPoint should never return */ b ShouldNeverGetHere - + diff --git a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm index d31a29b7c9..63174d4b84 100644 --- a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm +++ b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm @@ -1,4 +1,4 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
// @@ -16,21 +16,21 @@ #include #include INCLUDE AsmMacroIoLib.inc - + IMPORT CEntryPoint EXPORT _ModuleEntryPoint - + PRESERVE8 AREA ModuleEntryPoint, CODE, READONLY - + _ModuleEntryPoint - + //Disable L2 cache mrc p15, 0, r0, c1, c0, 1 // read Auxiliary Control Register bic r0, r0, #0x00000002 // disable L2 cache mcr p15, 0, r0, c1, c0, 1 // store Auxiliary Control Register - + //Enable Strict alignment checking & Instruction cache mrc p15, 0, r0, c1, c0, 0 bic r0, r0, #0x00002300 /* clear bits 13, 9:8 (--V- --RS) */ @@ -38,14 +38,14 @@ _ModuleEntryPoint orr r0, r0, #0x00000002 /* set bit 1 (A) Align */ orr r0, r0, #0x00001000 /* set bit 12 (I) enable I-Cache */ mcr p15, 0, r0, c1, c0, 0 - + // Enable NEON register in case folks want to use them for optimizations (CopyMem) mrc p15, 0, r0, c1, c0, 2 orr r0, r0, #0x00f00000 // Enable VPF access (V* instructions) mcr p15, 0, r0, c1, c0, 2 mov r0, #0x40000000 // Set EN bit in FPEXC msr FPEXC,r0 - + // Set CPU vectors to start of DRAM LoadConstantToReg (FixedPcdGet32(PcdCpuVectorBaseAddress) ,r0) // Get vector base mcr p15, 0, r0, c12, c0, 0 @@ -59,16 +59,16 @@ FillVectors adds r2, r2, #4 cmp r2, #32 bne FillVectors - + /* before we call C code, lets setup the stack pointer in internal RAM */ stack_pointer_setup // - // Set stack based on PCD values. Need to do it this way to make C code work - // when it runs from FLASH. - // - LoadConstantToReg (FixedPcdGet32(PcdPrePiStackBase) ,r2) // stack base arg2 - LoadConstantToReg (FixedPcdGet32(PcdPrePiStackSize) ,r3) // stack size arg3 + // Set stack based on PCD values. Need to do it this way to make C code work + // when it runs from FLASH. + // + LoadConstantToReg (FixedPcdGet32(PcdPrePiStackBase) ,r2) // stack base arg2 + LoadConstantToReg (FixedPcdGet32(PcdPrePiStackSize) ,r3) // stack size arg3 add r4, r2, r3 //Enter SVC mode and set up SVC stack pointer @@ -77,13 +77,13 @@ stack_pointer_setup mov r13,r4 // Call C entry point - LoadConstantToReg (FixedPcdGet32(PcdMemorySize) ,r1) // memory size arg1 + LoadConstantToReg (FixedPcdGet32(PcdMemorySize) ,r1) // memory size arg1 LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0) // memory start arg0 - blx CEntryPoint // Assume C code is thumb + blx CEntryPoint // Assume C code is thumb ShouldNeverGetHere /* _CEntryPoint should never return */ b ShouldNeverGetHere - + END diff --git a/BeagleBoardPkg/Sec/Cache.c b/BeagleBoardPkg/Sec/Cache.c index 193004a8e8..7399eef5be 100644 --- a/BeagleBoardPkg/Sec/Cache.c +++ b/BeagleBoardPkg/Sec/Cache.c @@ -1,7 +1,7 @@ /** @file Copyright (c) 2008 - 2009, Apple Inc. 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 @@ -60,7 +60,7 @@ InitCache ( MemoryTable[1].VirtualBase = SOC_REGISTERS_L3_PHYSICAL_BASE; MemoryTable[1].Length = SOC_REGISTERS_L3_PHYSICAL_LENGTH; MemoryTable[1].Attributes = SOC_REGISTERS_L3_ATTRIBUTES; - + // SOC Registers. L4 interconnects MemoryTable[2].PhysicalBase = SOC_REGISTERS_L4_PHYSICAL_BASE; MemoryTable[2].VirtualBase = SOC_REGISTERS_L4_PHYSICAL_BASE; @@ -72,8 +72,8 @@ InitCache ( MemoryTable[3].VirtualBase = 0; MemoryTable[3].Length = 0; MemoryTable[3].Attributes = (ARM_MEMORY_REGION_ATTRIBUTES)0; - + ArmConfigureMmu (MemoryTable, &TranslationTableBase, &TranslationTableSize); - + BuildMemoryAllocationHob((EFI_PHYSICAL_ADDRESS)(UINTN)TranslationTableBase, TranslationTableSize, EfiBootServicesData); } diff --git a/BeagleBoardPkg/Sec/Clock.c b/BeagleBoardPkg/Sec/Clock.c index 8de24f851c..24fdc71c42 100644 --- a/BeagleBoardPkg/Sec/Clock.c +++ b/BeagleBoardPkg/Sec/Clock.c @@ -1,7 +1,7 @@ /** @file Copyright (c) 2008 - 2009, Apple Inc. 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 diff --git a/BeagleBoardPkg/Sec/LzmaDecompress.h b/BeagleBoardPkg/Sec/LzmaDecompress.h index e4483b6823..a79ff343d2 100644 --- a/BeagleBoardPkg/Sec/LzmaDecompress.h +++ b/BeagleBoardPkg/Sec/LzmaDecompress.h @@ -19,16 +19,16 @@ Examines a GUIDed section and returns the size of the decoded buffer and the size of an scratch buffer required to actually decode the data in a GUIDed section. - Examines a GUIDed section specified by InputSection. + Examines a GUIDed section specified by InputSection. If GUID for InputSection does not match the GUID that this handler supports, - then RETURN_UNSUPPORTED is returned. + then RETURN_UNSUPPORTED is returned. If the required information can not be retrieved from InputSection, then RETURN_INVALID_PARAMETER is returned. If the GUID of InputSection does match the GUID that this handler supports, then the size required to hold the decoded buffer is returned in OututBufferSize, the size of an optional scratch buffer is returned in ScratchSize, and the Attributes field from EFI_GUID_DEFINED_SECTION header of InputSection is returned in SectionAttribute. - + If InputSection is NULL, then ASSERT(). If OutputBufferSize is NULL, then ASSERT(). If ScratchBufferSize is NULL, then ASSERT(). @@ -59,16 +59,16 @@ LzmaGuidedSectionGetInfo ( /** Decompress a LZAM compressed GUIDed section into a caller allocated output buffer. - - Decodes the GUIDed section specified by InputSection. - If GUID for InputSection does not match the GUID that this handler supports, then RETURN_UNSUPPORTED is returned. + + Decodes the GUIDed section specified by InputSection. + If GUID for InputSection does not match the GUID that this handler supports, then RETURN_UNSUPPORTED is returned. If the data in InputSection can not be decoded, then RETURN_INVALID_PARAMETER is returned. If the GUID of InputSection does match the GUID that this handler supports, then InputSection is decoded into the buffer specified by OutputBuffer and the authentication status of this decode operation is returned in AuthenticationStatus. If the decoded buffer is identical to the data in InputSection, then OutputBuffer is set to point at the data in InputSection. Otherwise, the decoded data will be placed in caller allocated buffer specified by OutputBuffer. - + If InputSection is NULL, then ASSERT(). If OutputBuffer is NULL, then ASSERT(). If ScratchBuffer is NULL and this decode operation requires a scratch buffer, then ASSERT(). @@ -76,10 +76,10 @@ LzmaGuidedSectionGetInfo ( @param[in] InputSection A pointer to a GUIDed section of an FFS formatted file. - @param[out] OutputBuffer A pointer to a buffer that contains the result of a decode operation. + @param[out] OutputBuffer A pointer to a buffer that contains the result of a decode operation. @param[out] ScratchBuffer A caller allocated buffer that may be required by this function - as a scratch buffer to perform the decode operation. - @param[out] AuthenticationStatus + as a scratch buffer to perform the decode operation. + @param[out] AuthenticationStatus A pointer to the authentication status of the decoded output buffer. See the definition of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI section of the PI Specification. EFI_AUTH_STATUS_PLATFORM_OVERRIDE must @@ -98,6 +98,6 @@ LzmaGuidedSectionExtraction ( OUT VOID *ScratchBuffer, OPTIONAL OUT UINT32 *AuthenticationStatus ); - + #endif // __LZMADECOMPRESS_H__ diff --git a/BeagleBoardPkg/Sec/PadConfiguration.c b/BeagleBoardPkg/Sec/PadConfiguration.c index ddd9296120..2dace3bf38 100644 --- a/BeagleBoardPkg/Sec/PadConfiguration.c +++ b/BeagleBoardPkg/Sec/PadConfiguration.c @@ -1,7 +1,7 @@ /** @file Copyright (c) 2008 - 2009, Apple Inc. 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 diff --git a/BeagleBoardPkg/Sec/Sec.c b/BeagleBoardPkg/Sec/Sec.c index eea9455e3f..0708396d97 100644 --- a/BeagleBoardPkg/Sec/Sec.c +++ b/BeagleBoardPkg/Sec/Sec.c @@ -2,7 +2,7 @@ C Entry point for the SEC. First C code after the reset vector. Copyright (c) 2008 - 2009, Apple Inc. 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 @@ -93,9 +93,9 @@ UartInit ( MmioWrite32 (UartBaseAddress + UART_MCR_REG, UART_MCR_RTS_FORCE_ACTIVE | UART_MCR_DTR_FORCE_ACTIVE); // Clear & enable fifos - MmioWrite32 (UartBaseAddress + UART_FCR_REG, UART_FCR_TX_FIFO_CLEAR | UART_FCR_RX_FIFO_CLEAR | UART_FCR_FIFO_ENABLE); + MmioWrite32 (UartBaseAddress + UART_FCR_REG, UART_FCR_TX_FIFO_CLEAR | UART_FCR_RX_FIFO_CLEAR | UART_FCR_FIFO_ENABLE); - // Restore MODE_SELECT + // Restore MODE_SELECT MmioWrite32 (UartBaseAddress + UART_MDR1_REG, UART_MDR1_MODE_SELECT_UART_16X); } @@ -153,7 +153,7 @@ CEntryPoint ( // Start talking UartInit (); - + InitializeDebugAgent (DEBUG_AGENT_INIT_PREMEM_SEC, NULL, NULL); SaveAndSetDebugTimerInterrupt (TRUE); @@ -179,7 +179,7 @@ CEntryPoint ( // Load the DXE Core and transfer control to it LoadDxeCoreFromFv (NULL, 0); - + // DXE Core should always load and never return ASSERT (FALSE); } diff --git a/BeagleBoardPkg/Sec/Sec.inf b/BeagleBoardPkg/Sec/Sec.inf index 7fc4ec12d4..eb6d93c000 100644 --- a/BeagleBoardPkg/Sec/Sec.inf +++ b/BeagleBoardPkg/Sec/Sec.inf @@ -1,16 +1,16 @@ #/** @file # SEC - Reset vector code that jumps to C and loads DXE core -# +# # Copyright (c) 2008, Apple Inc. 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. -# +# #**/ [Defines] @@ -30,7 +30,7 @@ Cache.c PadConfiguration.c Clock.c - + [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec @@ -52,7 +52,7 @@ MemoryAllocationLib PrePiHobListPointerLib -[FeaturePcd] +[FeaturePcd] gEmbeddedTokenSpaceGuid.PcdCacheEnable [FixedPcd] @@ -65,9 +65,9 @@ gEmbeddedTokenSpaceGuid.PcdPrePiStackBase gEmbeddedTokenSpaceGuid.PcdMemoryBase gEmbeddedTokenSpaceGuid.PcdMemorySize - + gOmap35xxTokenSpaceGuid.PcdOmap35xxConsoleUart gOmap35xxTokenSpaceGuid.PcdOmap35xxFreeTimer - + gArmTokenSpaceGuid.PcdCpuVectorBaseAddress -- cgit v1.2.3