ArmPlatformPkg/ArmPlatformLib: Removed 'ArmPlatformIsMemoryInitialized' function

'ArmPlatformInitializeBootMemory' function can check if the memory has already
been initialized.



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12414 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 0 insertions, 99 deletions

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S
deleted file mode 100644
index e48770ea43..0000000000
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S
+++ /dev/null
@@ -1,47 +0,0 @@
-//

-//  Copyright (c) 2011, 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         

-//  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 <AsmMacroIoLib.h>

-#include <Base.h>

-#include <Library/PcdLib.h>

-#include <Library/ArmPlatformLib.h>

-#include <ArmPlatform.h>

-#include <AutoGen.h>

-

-.text

-.align 3

-

-GCC_ASM_EXPORT(ArmPlatformIsMemoryInitialized)

-

-/**

-  Called at the early stage of the Boot phase to know if the memory has already been initialized

-

-  Running the code from the reset vector does not mean we start from cold boot. In some case, we

-  can go through this code with the memory already initialized.

-  Because this function is called at the early stage, the implementation must not use the stack.

-  Its implementation must probably done in assembly to ensure this requirement.

-

-  @return   Return the condition value into the 'Z' flag

-

-**/

-ASM_PFX(ArmPlatformIsMemoryInitialized):

-  // Check if the memory has been already mapped, if so skipped the memory initialization

-  LoadConstantToReg (ARM_EB_SYSCTRL, r0)

-  ldr   r0, [r0, #0]

-  

-  // 0x200 (BIT9): This read-only bit returns the remap status.

-  and   r0, r0, #0x200

-  tst   r0, #0x200

-  bx	lr

-    

-ASM_FUNCTION_REMOVE_IF_UNREFERENCED
\ No newline at end of file
diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.asm b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.asm
deleted file mode 100644
index b72fc6f37e..0000000000
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.asm
+++ /dev/null
@@ -1,48 +0,0 @@
-//

-//  Copyright (c) 2011, 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

-//  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 <AsmMacroIoLib.h>

-#include <Base.h>

-#include <Library/PcdLib.h>

-#include <Library/ArmPlatformLib.h>

-#include <ArmPlatform.h>

-#include <AutoGen.h>

-

-  INCLUDE AsmMacroIoLib.inc

-  

-  EXPORT  ArmPlatformIsMemoryInitialized

-  

-  PRESERVE8

-  AREA    ArmRealViewEbHelper, CODE, READONLY

-

-/**

-  Called at the early stage of the Boot phase to know if the memory has already been initialized

-

-  Running the code from the reset vector does not mean we start from cold boot. In some case, we

-  can go through this code with the memory already initialized.

-  Because this function is called at the early stage, the implementation must not use the stack.

-  Its implementation must probably done in assembly to ensure this requirement.

-

-  @return   Return the condition value into the 'Z' flag

-

-**/

-ArmPlatformIsMemoryInitialized

-  // Check if the memory has been already mapped, if so skipped the memory initialization

-  LoadConstantToReg (ARM_EB_SYSCTRL, r0)

-  ldr   r0, [r0, #0]

-  

-  // 0x200 (BIT9): This read-only bit returns the remap status.

-  and   r0, r0, #0x200

-  tst   r0, #0x200

-  bx	lr

-  END

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf
index 3682f6b7c2..a73ba2c8ae 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf
@@ -34,8 +34,6 @@
 [Sources.common]

   ArmRealViewEb.c

   ArmRealViewEbMem.c

-  ArmRealViewEbHelper.asm   | RVCT

-  ArmRealViewEbHelper.S     | GCC

 

 [FeaturePcd]

   gEmbeddedTokenSpaceGuid.PcdCacheEnable

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
index 17df8100a4..d59fbfdfe8 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
@@ -33,8 +33,6 @@
 [Sources.common]

   ArmRealViewEb.c

   ArmRealViewEbSec.c

-  ArmRealViewEbHelper.asm   | RVCT

-  ArmRealViewEbHelper.S     | GCC

   ArmRealViewEbBoot.asm     | RVCT

   ArmRealViewEbBoot.S       | GCC