From b5a572238d3c45ec8d3d0ec2c6ee3e6930458b96 Mon Sep 17 00:00:00 2001 From: oliviermartin Date: Fri, 10 May 2013 12:49:10 +0000 Subject: ArmPlatform/ArmPlatformLib: Introduced ArmPlatformPeiBootAction() This function allows platform to do any specific actions prior to the start the PEI phase. For instance, this function could be used by some platforms to initialize clocks that are required at the early stage of the PEI phase. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin Acked-by: Ryan Harkin Reviewed-by: Leif Lindholm git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14347 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S | 8 ++++++-- .../Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.asm | 11 +++++++---- .../Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf | 4 +++- 3 files changed, 16 insertions(+), 7 deletions(-) (limited to 'ArmPlatformPkg/ArmRealViewEbPkg') diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S index 847509f9d2..3baad66431 100644 --- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S +++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S @@ -1,5 +1,5 @@ // -// Copyright (c) 2012, ARM Limited. All rights reserved. +// Copyright (c) 2012-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 @@ -15,8 +15,9 @@ #include .text -.align 3 +.align 2 +GCC_ASM_EXPORT(ArmPlatformPeiBootAction) GCC_ASM_EXPORT(ArmPlatformGetCorePosition) GCC_ASM_EXPORT(ArmPlatformIsPrimaryCore) @@ -47,3 +48,6 @@ ASM_PFX(ArmPlatformIsPrimaryCore): moveq r0, #1 movne r0, #0 bx lr + +ASM_PFX(ArmPlatformPeiBootAction): + bx lr diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.asm b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.asm index 6d35182a27..55b211ea12 100644 --- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.asm +++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.asm @@ -1,5 +1,5 @@ // -// Copyright (c) 2012, ARM Limited. All rights reserved. +// Copyright (c) 2012-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 @@ -16,14 +16,14 @@ INCLUDE AsmMacroIoLib.inc + EXPORT ArmPlatformPeiBootAction EXPORT ArmPlatformGetCorePosition EXPORT ArmPlatformIsPrimaryCore IMPORT _gPcd_FixedAtBuild_PcdArmPrimaryCore IMPORT _gPcd_FixedAtBuild_PcdArmPrimaryCoreMask - PRESERVE8 - AREA ArmPlatformNullHelper, CODE, READONLY + AREA ArmRealViewEbHelper, CODE, READONLY //UINTN //ArmPlatformGetCorePosition ( @@ -52,5 +52,8 @@ ArmPlatformIsPrimaryCore FUNCTION bx lr ENDFUNC - END +ArmPlatformPeiBootAction FUNCTION + bx lr + ENDFUNC + END diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf index a8fe3b4ce3..a97ee41c4a 100644 --- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf +++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf @@ -1,5 +1,5 @@ #/* @file -# Copyright (c) 2011-2012, ARM Limited. All rights reserved. +# 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 @@ -32,6 +32,8 @@ MemoryAllocationLib [Sources.common] + ArmRealViewEbHelper.asm | RVCT + ArmRealViewEbHelper.S | GCC ArmRealViewEb.c ArmRealViewEbMem.c ArmRealViewEbHelper.asm | RVCT -- cgit v1.2.3