diff --git a/ArmPlatformPkg/PeilessSec/Arm/ArchPeilessSec.c b/ArmPlatformPkg/PeilessSec/Arm/ArchPeilessSec.c deleted file mode 100644 index e2f6f67904..0000000000 --- a/ArmPlatformPkg/PeilessSec/Arm/ArchPeilessSec.c +++ /dev/null @@ -1,21 +0,0 @@ -/** @file - - Copyright (c) 2011 - 2013, ARM Limited. All rights reserved. - - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#include "PeilessSec.h" - -/** - Architecture specific initialization routine. -**/ -VOID -ArchInitialize ( - VOID - ) -{ - // Enable program flow prediction, if supported. - ArmEnableBranchPrediction (); -} diff --git a/ArmPlatformPkg/PeilessSec/Arm/ModuleEntryPoint.S b/ArmPlatformPkg/PeilessSec/Arm/ModuleEntryPoint.S deleted file mode 100644 index 9043d8679a..0000000000 --- a/ArmPlatformPkg/PeilessSec/Arm/ModuleEntryPoint.S +++ /dev/null @@ -1,97 +0,0 @@ -// -// Copyright (c) 2011 - 2020, Arm Limited. All rights reserved.
-// -// SPDX-License-Identifier: BSD-2-Clause-Patent -// -// - -#include - -#include - -ASM_FUNC(_ModuleEntryPoint) - // Do early platform specific actions - bl ASM_PFX(ArmPlatformPeiBootAction) - -#if (FixedPcdGet32 (PcdVFPEnabled)) - // Enable Floating Point. This needs to be done before entering C code, which - // may use FP/SIMD registers. - bl ArmEnableVFP -#endif - -// Check if we can install the stack at the top of the System Memory or if we need -// to install the stacks at the bottom of the Firmware Device (case the FD is located -// at the top of the DRAM) -_SystemMemoryEndInit: - ADRL (r1, mSystemMemoryEnd) - ldrd r2, r3, [r1] - teq r3, #0 - moveq r1, r2 - mvnne r1, #0 - -_SetupStackPosition: - // r1 = SystemMemoryTop - - // Calculate Top of the Firmware Device - MOV32 (r2, FixedPcdGet32(PcdFdBaseAddress)) - MOV32 (r3, FixedPcdGet32(PcdFdSize) - 1) - add r3, r3, r2 // r3 = FdTop = PcdFdBaseAddress + PcdFdSize - - // UEFI Memory Size (stacks are allocated in this region) - MOV32 (r4, FixedPcdGet32(PcdSystemMemoryUefiRegionSize)) - - // - // Reserve the memory for the UEFI region (contain stacks on its top) - // - - // Calculate how much space there is between the top of the Firmware and the Top of the System Memory - subs r0, r1, r3 // r0 = SystemMemoryTop - FdTop - bmi _SetupStack // Jump if negative (FdTop > SystemMemoryTop). Case when SEC is in XIP memory outside of the DRAM - cmp r0, r4 - bge _SetupStack - - // Case the top of stacks is the FdBaseAddress - mov r1, r2 - -_SetupStack: - // r1 contains the top of the stack (and the UEFI Memory) - - // Because the 'push' instruction is equivalent to 'stmdb' (decrement before), we need to increment - // one to the top of the stack. We check if incrementing one does not overflow (case of DRAM at the - // top of the memory space) - adds r9, r1, #1 - bcs _SetupOverflowStack - -_SetupAlignedStack: - mov r1, r9 - b _GetBaseUefiMemory - -_SetupOverflowStack: - // Case memory at the top of the address space. Ensure the top of the stack is EFI_PAGE_SIZE - // aligned (4KB) - MOV32 (r9, ~EFI_PAGE_MASK & 0xFFFFFFFF) - and r1, r1, r9 - -_GetBaseUefiMemory: - // Calculate the Base of the UEFI Memory - sub r0, r1, r4 - -_GetStackBase: - // r1 = The top of the stack - mov sp, r1 - - // Stack for the primary core = PrimaryCoreStack - MOV32 (r2, FixedPcdGet32(PcdCPUCorePrimaryStackSize)) - sub r1, r1, r2 - - // Move sec startup address into a data register - // Ensure we're jumping to FV version of the code (not boot remapped alias) - ldr r4, =ASM_PFX(CEntryPoint) - - // Jump to SEC C code - // r0 = UefiMemoryBase - // r1 = StacksBase - blx r4 - -_NeverReturn: - b _NeverReturn diff --git a/ArmPlatformPkg/PeilessSec/PeilessSec.inf b/ArmPlatformPkg/PeilessSec/PeilessSec.inf index db7449f61b..f5e0726adb 100644 --- a/ArmPlatformPkg/PeilessSec/PeilessSec.inf +++ b/ArmPlatformPkg/PeilessSec/PeilessSec.inf @@ -20,10 +20,6 @@ PeilessSec.h PeilessSec.c -[Sources.ARM] - Arm/ArchPeilessSec.c - Arm/ModuleEntryPoint.S - [Sources.AArch64] AArch64/ArchPeilessSec.c AArch64/ModuleEntryPoint.S @@ -74,9 +70,6 @@ gArmTokenSpaceGuid.PcdFvSize gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize -[FixedPcd.ARM] - gArmTokenSpaceGuid.PcdVFPEnabled - [Pcd] gArmTokenSpaceGuid.PcdSystemMemoryBase gArmTokenSpaceGuid.PcdSystemMemorySize