From c21e237866d66a9b94743a5a12b3797b478e1b68 Mon Sep 17 00:00:00 2001 From: oliviermartin Date: Thu, 22 Sep 2011 23:16:56 +0000 Subject: ArmPlatformPkg/ArmRealViewEbPkg: Removed unused 'Pei' module ArmRealViewEbPkg is now using the ArmPlatform Common modules (ArmPlatformPkg/Sec and ArmPlatformPkg/PrePeiCore). git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12425 6f19259b-4bc3-4df7-8a09-765794883524 --- .../ArmRealViewEbPkg/Pei/Arm/ModuleEntryPoint.S | 68 --------- .../ArmRealViewEbPkg/Pei/Arm/ModuleEntryPoint.asm | 80 ---------- ArmPlatformPkg/ArmRealViewEbPkg/Pei/Cache.c | 79 ---------- .../ArmRealViewEbPkg/Pei/LzmaDecompress.h | 103 ------------- .../ArmRealViewEbPkg/Pei/ModuleEntryPoint.S | 68 --------- .../ArmRealViewEbPkg/Pei/ModuleEntryPoint.asm | 80 ---------- ArmPlatformPkg/ArmRealViewEbPkg/Pei/Sec.c | 164 --------------------- ArmPlatformPkg/ArmRealViewEbPkg/Pei/Sec.inf | 69 --------- 8 files changed, 711 deletions(-) delete mode 100644 ArmPlatformPkg/ArmRealViewEbPkg/Pei/Arm/ModuleEntryPoint.S delete mode 100644 ArmPlatformPkg/ArmRealViewEbPkg/Pei/Arm/ModuleEntryPoint.asm delete mode 100644 ArmPlatformPkg/ArmRealViewEbPkg/Pei/Cache.c delete mode 100644 ArmPlatformPkg/ArmRealViewEbPkg/Pei/LzmaDecompress.h delete mode 100644 ArmPlatformPkg/ArmRealViewEbPkg/Pei/ModuleEntryPoint.S delete mode 100644 ArmPlatformPkg/ArmRealViewEbPkg/Pei/ModuleEntryPoint.asm delete mode 100644 ArmPlatformPkg/ArmRealViewEbPkg/Pei/Sec.c delete mode 100644 ArmPlatformPkg/ArmRealViewEbPkg/Pei/Sec.inf (limited to 'ArmPlatformPkg/ArmRealViewEbPkg') diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Pei/Arm/ModuleEntryPoint.S b/ArmPlatformPkg/ArmRealViewEbPkg/Pei/Arm/ModuleEntryPoint.S deleted file mode 100644 index 2b5ee8f31a..0000000000 --- a/ArmPlatformPkg/ArmRealViewEbPkg/Pei/Arm/ModuleEntryPoint.S +++ /dev/null @@ -1,68 +0,0 @@ -#------------------------------------------------------------------------------ -# -# ARM EB Entry point. Reset vector in FV header will brach to -# _ModuleEntryPoint. -# -# We use crazy macros, like LoadConstantToReg, since Xcode assembler -# does not support = assembly syntax for ldr. -# -# 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 -# 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 -#include -#include -#include - -.text -.align 3 - -.globl ASM_PFX(CEntryPoint) -.globl ASM_PFX(_ModuleEntryPoint) - -ASM_PFX(_ModuleEntryPoint): - - // Turn off remapping NOR to 0. We can now use DRAM in low memory - // CAN'T DO THIS HERE -- BRANCH FROM RESET VECTOR IS RELATIVE AND REMAINS IN REMAPPED NOR - //MmioOr32 (EB_SP810_CTRL_BASE ,BIT8) - - // 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 - mcr p10,#0x7,r0,c8,c0,#0 // msr FPEXC,r0 in ARM assembly - - // Set CPU vectors to 0 (which is currently flash) - LoadConstantToReg (FixedPcdGet32(PcdCpuVectorBaseAddress) ,r0) // Get vector base - mcr p15, 0, r0, c12, c0, 0 - isb // Sync changes to control registers - - // - // 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 - mov r13, r4 - - // Call C entry point - LoadConstantToReg (FixedPcdGet32(PcdMemorySize) ,r1) // memory size arg1 - LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0) // memory size arg0 - blx ASM_PFX(CEntryPoint) - -ShouldNeverGetHere: - // _CEntryPoint should never return - b ShouldNeverGetHere - - diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Pei/Arm/ModuleEntryPoint.asm b/ArmPlatformPkg/ArmRealViewEbPkg/Pei/Arm/ModuleEntryPoint.asm deleted file mode 100644 index aa0b98f3e6..0000000000 --- a/ArmPlatformPkg/ArmRealViewEbPkg/Pei/Arm/ModuleEntryPoint.asm +++ /dev/null @@ -1,80 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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 -// 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 -#include -#include -#include -#include - - INCLUDE AsmMacroIoLib.inc - - IMPORT CEntryPoint - EXPORT _ModuleEntryPoint - - PRESERVE8 - AREA ModuleEntryPoint, CODE, READONLY - - -StartupAddr DCD CEntryPoint - -_ModuleEntryPoint - - // Turn off remapping NOR to 0. We can now use DRAM in low memory - // CAN'T DO THIS HERE -- BRANCH FROM RESET VECTOR IS RELATIVE AND REMAINS IN REMAPPED NOR - //MmioOr32 (0x10001000 ,BIT8) //EB_SP810_CTRL_BASE - - // 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 VFP access (V* instructions) - 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 0 (which is currently flash) - LoadConstantToReg (FixedPcdGet32(PcdCpuVectorBaseAddress) ,r0) // Get vector base - mcr p15, 0, r0, c12, c0, 0 - isb // Sync changes to control registers - - // - // 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 - mov r13, r4 - - LoadConstantToReg (FixedPcdGet32(PcdMemorySize) ,r1) // memory size arg1 - LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0) // memory size arg0 - - // move sec startup address into a data register - // ensure we're jumping to FV version of the code (not boot remapped alias) - ldr r4, StartupAddr - - // jump to SEC C code - blx r4 - - // Call C entry point - // THIS DOESN'T WORK, WE NEED A LONG JUMP - - // blx CEntryPoint - -ShouldNeverGetHere - // _CEntryPoint should never return - b ShouldNeverGetHere - - END - - diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Pei/Cache.c b/ArmPlatformPkg/ArmRealViewEbPkg/Pei/Cache.c deleted file mode 100644 index a0e3abb4eb..0000000000 --- a/ArmPlatformPkg/ArmRealViewEbPkg/Pei/Cache.c +++ /dev/null @@ -1,79 +0,0 @@ -/** @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 - 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 - -#include -#include -#include - -// DDR attributes -#define DDR_ATTRIBUTES_CACHED ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK -#define DDR_ATTRIBUTES_UNCACHED ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED - -// SoC registers. L3 interconnects -#define SOC_REGISTERS_L3_PHYSICAL_BASE 0x68000000 -#define SOC_REGISTERS_L3_PHYSICAL_LENGTH 0x08000000 -#define SOC_REGISTERS_L3_ATTRIBUTES ARM_MEMORY_REGION_ATTRIBUTE_DEVICE - -// SoC registers. L4 interconnects -#define SOC_REGISTERS_L4_PHYSICAL_BASE 0x48000000 -#define SOC_REGISTERS_L4_PHYSICAL_LENGTH 0x08000000 -#define SOC_REGISTERS_L4_ATTRIBUTES ARM_MEMORY_REGION_ATTRIBUTE_DEVICE - -VOID -InitCache ( - IN UINT32 MemoryBase, - IN UINT32 MemoryLength - ) -{ - UINT32 CacheAttributes; - ARM_MEMORY_REGION_DESCRIPTOR MemoryTable[5]; - VOID *TranslationTableBase; - UINTN TranslationTableSize; - - if (FeaturePcdGet(PcdCacheEnable) == TRUE) { - CacheAttributes = DDR_ATTRIBUTES_CACHED; - } else { - CacheAttributes = DDR_ATTRIBUTES_UNCACHED; - } - - // DDR - MemoryTable[0].PhysicalBase = MemoryBase; - MemoryTable[0].VirtualBase = MemoryBase; - MemoryTable[0].Length = MemoryLength; - MemoryTable[0].Attributes = (ARM_MEMORY_REGION_ATTRIBUTES)CacheAttributes; - - // SOC Registers. L3 interconnects - MemoryTable[1].PhysicalBase = SOC_REGISTERS_L3_PHYSICAL_BASE; - 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; - MemoryTable[2].Length = SOC_REGISTERS_L4_PHYSICAL_LENGTH; - MemoryTable[2].Attributes = SOC_REGISTERS_L4_ATTRIBUTES; - - // End of Table - MemoryTable[3].PhysicalBase = 0; - 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/ArmPlatformPkg/ArmRealViewEbPkg/Pei/LzmaDecompress.h b/ArmPlatformPkg/ArmRealViewEbPkg/Pei/LzmaDecompress.h deleted file mode 100644 index e4483b6823..0000000000 --- a/ArmPlatformPkg/ArmRealViewEbPkg/Pei/LzmaDecompress.h +++ /dev/null @@ -1,103 +0,0 @@ -/** @file - LZMA Decompress Library header file - - Copyright (c) 2006 - 2010, Intel Corporation. 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. - -**/ - -#ifndef __LZMA_DECOMPRESS_H___ -#define __LZMA_DECOMPRESS_H___ - -/** - 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. - If GUID for InputSection does not match the GUID that this handler supports, - 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(). - If SectionAttribute is NULL, then ASSERT(). - - - @param[in] InputSection A pointer to a GUIDed section of an FFS formatted file. - @param[out] OutputBufferSize A pointer to the size, in bytes, of an output buffer required - if the buffer specified by InputSection were decoded. - @param[out] ScratchBufferSize A pointer to the size, in bytes, required as scratch space - if the buffer specified by InputSection were decoded. - @param[out] SectionAttribute A pointer to the attributes of the GUIDed section. See the Attributes - field of EFI_GUID_DEFINED_SECTION in the PI Specification. - - @retval RETURN_SUCCESS The information about InputSection was returned. - @retval RETURN_UNSUPPORTED The section specified by InputSection does not match the GUID this handler supports. - @retval RETURN_INVALID_PARAMETER The information can not be retrieved from the section specified by InputSection. - -**/ -RETURN_STATUS -EFIAPI -LzmaGuidedSectionGetInfo ( - IN CONST VOID *InputSection, - OUT UINT32 *OutputBufferSize, - OUT UINT32 *ScratchBufferSize, - OUT UINT16 *SectionAttribute - ); - -/** - 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. - 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(). - If AuthenticationStatus is NULL, then ASSERT(). - - - @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] ScratchBuffer A caller allocated buffer that may be required by this function - 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 - never be set by this handler. - - @retval RETURN_SUCCESS The buffer specified by InputSection was decoded. - @retval RETURN_UNSUPPORTED The section specified by InputSection does not match the GUID this handler supports. - @retval RETURN_INVALID_PARAMETER The section specified by InputSection can not be decoded. - -**/ -RETURN_STATUS -EFIAPI -LzmaGuidedSectionExtraction ( - IN CONST VOID *InputSection, - OUT VOID **OutputBuffer, - OUT VOID *ScratchBuffer, OPTIONAL - OUT UINT32 *AuthenticationStatus - ); - -#endif // __LZMADECOMPRESS_H__ - diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Pei/ModuleEntryPoint.S b/ArmPlatformPkg/ArmRealViewEbPkg/Pei/ModuleEntryPoint.S deleted file mode 100644 index 2b5ee8f31a..0000000000 --- a/ArmPlatformPkg/ArmRealViewEbPkg/Pei/ModuleEntryPoint.S +++ /dev/null @@ -1,68 +0,0 @@ -#------------------------------------------------------------------------------ -# -# ARM EB Entry point. Reset vector in FV header will brach to -# _ModuleEntryPoint. -# -# We use crazy macros, like LoadConstantToReg, since Xcode assembler -# does not support = assembly syntax for ldr. -# -# 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 -# 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 -#include -#include -#include - -.text -.align 3 - -.globl ASM_PFX(CEntryPoint) -.globl ASM_PFX(_ModuleEntryPoint) - -ASM_PFX(_ModuleEntryPoint): - - // Turn off remapping NOR to 0. We can now use DRAM in low memory - // CAN'T DO THIS HERE -- BRANCH FROM RESET VECTOR IS RELATIVE AND REMAINS IN REMAPPED NOR - //MmioOr32 (EB_SP810_CTRL_BASE ,BIT8) - - // 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 - mcr p10,#0x7,r0,c8,c0,#0 // msr FPEXC,r0 in ARM assembly - - // Set CPU vectors to 0 (which is currently flash) - LoadConstantToReg (FixedPcdGet32(PcdCpuVectorBaseAddress) ,r0) // Get vector base - mcr p15, 0, r0, c12, c0, 0 - isb // Sync changes to control registers - - // - // 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 - mov r13, r4 - - // Call C entry point - LoadConstantToReg (FixedPcdGet32(PcdMemorySize) ,r1) // memory size arg1 - LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0) // memory size arg0 - blx ASM_PFX(CEntryPoint) - -ShouldNeverGetHere: - // _CEntryPoint should never return - b ShouldNeverGetHere - - diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Pei/ModuleEntryPoint.asm b/ArmPlatformPkg/ArmRealViewEbPkg/Pei/ModuleEntryPoint.asm deleted file mode 100644 index aa0b98f3e6..0000000000 --- a/ArmPlatformPkg/ArmRealViewEbPkg/Pei/ModuleEntryPoint.asm +++ /dev/null @@ -1,80 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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 -// 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 -#include -#include -#include -#include - - INCLUDE AsmMacroIoLib.inc - - IMPORT CEntryPoint - EXPORT _ModuleEntryPoint - - PRESERVE8 - AREA ModuleEntryPoint, CODE, READONLY - - -StartupAddr DCD CEntryPoint - -_ModuleEntryPoint - - // Turn off remapping NOR to 0. We can now use DRAM in low memory - // CAN'T DO THIS HERE -- BRANCH FROM RESET VECTOR IS RELATIVE AND REMAINS IN REMAPPED NOR - //MmioOr32 (0x10001000 ,BIT8) //EB_SP810_CTRL_BASE - - // 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 VFP access (V* instructions) - 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 0 (which is currently flash) - LoadConstantToReg (FixedPcdGet32(PcdCpuVectorBaseAddress) ,r0) // Get vector base - mcr p15, 0, r0, c12, c0, 0 - isb // Sync changes to control registers - - // - // 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 - mov r13, r4 - - LoadConstantToReg (FixedPcdGet32(PcdMemorySize) ,r1) // memory size arg1 - LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0) // memory size arg0 - - // move sec startup address into a data register - // ensure we're jumping to FV version of the code (not boot remapped alias) - ldr r4, StartupAddr - - // jump to SEC C code - blx r4 - - // Call C entry point - // THIS DOESN'T WORK, WE NEED A LONG JUMP - - // blx CEntryPoint - -ShouldNeverGetHere - // _CEntryPoint should never return - b ShouldNeverGetHere - - END - - diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Pei/Sec.c b/ArmPlatformPkg/ArmRealViewEbPkg/Pei/Sec.c deleted file mode 100644 index cb5eb0a7b1..0000000000 --- a/ArmPlatformPkg/ArmRealViewEbPkg/Pei/Sec.c +++ /dev/null @@ -1,164 +0,0 @@ -/** @file - 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 - 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 - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include - -#include "LzmaDecompress.h" - -VOID -EFIAPI -_ModuleEntryPoint( - VOID - ); - -CHAR8 * -DeCygwinPathIfNeeded ( - IN CHAR8 *Name - ); - -RETURN_STATUS -EFIAPI -SerialPortInitialize ( - VOID - ); - - -VOID -UartInit ( - VOID - ) -{ - // SEC phase needs to run library constructors by hand. - // This assumes we are linked agains the SerialLib - // In non SEC modules the init call is in autogenerated code. - SerialPortInitialize (); -} - -VOID -TimerInit ( - VOID - ) -{ - // configure SP810 to use 1MHz clock and disable - MmioAndThenOr32 (EB_SP810_CTRL_BASE + SP810_SYS_CTRL_REG, ~SP810_SYS_CTRL_TIMER2_EN, SP810_SYS_CTRL_TIMER2_TIMCLK); - // Enable - MmioOr32 (EB_SP810_CTRL_BASE + SP810_SYS_CTRL_REG, SP810_SYS_CTRL_TIMER2_EN); - - // configure timer 2 for one shot operation, 32 bits, no prescaler, and interrupt disabled - MmioOr32 (EB_SP804_TIMER2_BASE + SP804_TIMER_CONTROL_REG, SP804_TIMER_CTRL_ONESHOT | SP804_TIMER_CTRL_32BIT | SP804_PRESCALE_DIV_1); - - // preload the timer count register - MmioWrite32 (EB_SP804_TIMER2_BASE + SP804_TIMER_LOAD_REG, 1); - - // enable the timer - MmioOr32 (EB_SP804_TIMER2_BASE + SP804_TIMER_CONTROL_REG, SP804_TIMER_CTRL_ENABLE); -} - - -VOID -InitCache ( - IN UINT32 MemoryBase, - IN UINT32 MemoryLength - ); - -EFI_STATUS -EFIAPI -ExtractGuidedSectionLibConstructor ( - VOID - ); - -EFI_STATUS -EFIAPI -LzmaDecompressLibConstructor ( - VOID - ); - - -VOID -CEntryPoint ( - IN VOID *MemoryBase, - IN UINTN MemorySize, - IN VOID *StackBase, - IN UINTN StackSize - ) -{ - VOID *HobBase; - - // HOB list is at bottom of stack area - // Stack grows from top-to-bottom towards HOB list - HobBase = (VOID *)StackBase; - CreateHobList (MemoryBase, MemorySize, HobBase, StackBase); - - // Turn off remapping NOR to 0. We can will now see DRAM in low memory - MmioOr32 (0x10001000 ,BIT8); //EB_SP810_CTRL_BASE - - // Enable program flow prediction, if supported. - ArmEnableBranchPrediction (); - - // Initialize CPU cache - InitCache ((UINT32)MemoryBase, (UINT32)MemorySize); - - // Add memory allocation hob for relocated FD - BuildMemoryAllocationHob (FixedPcdGet32(PcdEmbeddedFdBaseAddress), FixedPcdGet32(PcdEmbeddedFdSize), EfiBootServicesData); - - // Add the FVs to the hob list - BuildFvHob (PcdGet32(PcdFlashFvMainBase), PcdGet32(PcdFlashFvMainSize)); - - // Start talking - UartInit (); - - InitializeDebugAgent (DEBUG_AGENT_INIT_PREMEM_SEC, NULL, NULL); - SaveAndSetDebugTimerInterrupt (TRUE); - - DEBUG ((EFI_D_ERROR, "UART Enabled\n")); - - // Start up a free running timer so that the timer lib will work - TimerInit (); - - // SEC phase needs to run library constructors by hand. - ExtractGuidedSectionLibConstructor (); - LzmaDecompressLibConstructor (); - - // Build HOBs to pass up our version of stuff the DXE Core needs to save space - BuildPeCoffLoaderHob (); - BuildExtractSectionHob ( - &gLzmaCustomDecompressGuid, - LzmaGuidedSectionGetInfo, - LzmaGuidedSectionExtraction - ); - - // Assume the FV that contains the SEC (our code) also contains a compressed FV. - DecompressFirstFv (); - - // 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/ArmPlatformPkg/ArmRealViewEbPkg/Pei/Sec.inf b/ArmPlatformPkg/ArmRealViewEbPkg/Pei/Sec.inf deleted file mode 100644 index 3ee9017a7b..0000000000 --- a/ArmPlatformPkg/ArmRealViewEbPkg/Pei/Sec.inf +++ /dev/null @@ -1,69 +0,0 @@ - -#/** @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] - INF_VERSION = 0x00010005 - BASE_NAME = ArmEBSec - FILE_GUID = d959e387-7b91-452c-90e0-a1dbac90ddb8 - MODULE_TYPE = SEC - VERSION_STRING = 1.0 - - -[Sources.ARM] - ModuleEntryPoint.S | GCC - ModuleEntryPoint.asm | RVCT - -[Sources.ARM] - Sec.c - Cache.c - -[Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - EmbeddedPkg/EmbeddedPkg.dec - ArmPkg/ArmPkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec - ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEbPkg.dec - - -[LibraryClasses] - BaseLib - DebugLib - ArmLib - IoLib - ExtractGuidedSectionLib - LzmaDecompressLib - PeCoffGetEntryPointLib - DebugAgentLib - - -[FeaturePcd] - gEmbeddedTokenSpaceGuid.PcdCacheEnable - -[FixedPcd] - gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate - gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress - gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize - gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase - gEmbeddedTokenSpaceGuid.PcdFlashFvMainSize - gEmbeddedTokenSpaceGuid.PcdPrePiStackSize - gEmbeddedTokenSpaceGuid.PcdPrePiStackBase - gEmbeddedTokenSpaceGuid.PcdMemoryBase - gEmbeddedTokenSpaceGuid.PcdMemorySize - - - gArmTokenSpaceGuid.PcdCpuVectorBaseAddress - - -- cgit v1.2.3