From 44e272fd6ab9d7b859588eeffc02b8cd78d3c76b Mon Sep 17 00:00:00 2001 From: oliviermartin Date: Thu, 22 Sep 2011 23:02:13 +0000 Subject: ArmPlatformPkg/ArmPlatformLib: Introduce ArmPlatformSecBootAction function This function is called at the initial stage of the Secure boot process to allow platform vendors to add early actions. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12413 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmPlatformPkg/Sec/SecEntryPoint.S | 12 ++++++++---- ArmPlatformPkg/Sec/SecEntryPoint.asm | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) (limited to 'ArmPlatformPkg/Sec') diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.S b/ArmPlatformPkg/Sec/SecEntryPoint.S index 909f7fafb..f8599393c 100644 --- a/ArmPlatformPkg/Sec/SecEntryPoint.S +++ b/ArmPlatformPkg/Sec/SecEntryPoint.S @@ -30,6 +30,7 @@ GCC_ASM_EXPORT(_ModuleEntryPoint) #global functions referenced by this module GCC_ASM_IMPORT(CEntryPoint) +GCC_ASM_IMPORT(ArmPlatformSecBootAction) GCC_ASM_IMPORT(ArmPlatformIsMemoryInitialized) GCC_ASM_IMPORT(ArmPlatformInitializeBootMemory) GCC_ASM_IMPORT(ArmDisableInterrupts) @@ -46,16 +47,19 @@ StartupAddr: .word ASM_PFX(CEntryPoint) SecVectorTableAddr: .word ASM_PFX(SecVectorTable) ASM_PFX(_ModuleEntryPoint): - #Set VBAR to the start of the exception vectors in Secure Mode - ldr r0, SecVectorTableAddr - bl ASM_PFX(ArmWriteVBar) - # First ensure all interrupts are disabled bl ASM_PFX(ArmDisableInterrupts) # Ensure that the MMU and caches are off bl ASM_PFX(ArmDisableCachesAndMmu) + # Jump to Platform Specific Boot Action function + blx ASM_PFX(ArmPlatformSecBootAction) + + # Set VBAR to the start of the exception vectors in Secure Mode + ldr r0, =SecVectorTable + bl ASM_PFX(ArmWriteVBar) + _IdentifyCpu: # Identify CPU ID bl ASM_PFX(ArmReadMpidr) diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.asm b/ArmPlatformPkg/Sec/SecEntryPoint.asm index b291e5062..472abde7f 100644 --- a/ArmPlatformPkg/Sec/SecEntryPoint.asm +++ b/ArmPlatformPkg/Sec/SecEntryPoint.asm @@ -20,6 +20,7 @@ INCLUDE AsmMacroIoLib.inc IMPORT CEntryPoint + IMPORT ArmPlatformSecBootAction IMPORT ArmPlatformIsMemoryInitialized IMPORT ArmPlatformInitializeBootMemory IMPORT ArmDisableInterrupts @@ -39,16 +40,19 @@ StartupAddr DCD CEntryPoint _ModuleEntryPoint - //Set VBAR to the start of the exception vectors in Secure Mode - ldr r0, =SecVectorTable - blx ArmWriteVBar - // First ensure all interrupts are disabled blx ArmDisableInterrupts // Ensure that the MMU and caches are off blx ArmDisableCachesAndMmu + // Jump to Platform Specific Boot Action function + blx ArmPlatformSecBootAction + + // Set VBAR to the start of the exception vectors in Secure Mode + ldr r0, =SecVectorTable + blx ArmWriteVBar + _IdentifyCpu // Identify CPU ID bl ArmReadMpidr -- cgit v1.2.3