Need to add some extra functions to the libraries to support paging in the CpuDxe...

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

diff --git a/ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf b/ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
index 93b88f4ef0a8958122d6849816547296c068dc40..6a85c3688565cc77994bf79a36e83aef7736d8f8 100644 (file)
--- a/ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
+++ b/ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
@@ -1,4 +1,18 @@
-#%HEADER%
+#/** @file
+# Semihosting  serail port lib
+#
+# 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                      = ArmCacheMaintenanceLib
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = ArmCacheMaintenanceLib

diff --git a/ArmPkg/Library/ArmLib/Arm11/Arm11ArmLib.inf b/ArmPkg/Library/ArmLib/Arm11/Arm11ArmLib.inf
index 8042e4dd318f75c530b312ed51c8f2a88bdb0af9..39d0bef80077e66af40cdb8ed0dbeccbb56ad49c 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm11/Arm11ArmLib.inf
+++ b/ArmPkg/Library/ArmLib/Arm11/Arm11ArmLib.inf
@@ -1,4 +1,18 @@
-#%HEADER%\r
+#/** @file\r
+# Semihosting  serail port lib\r
+#\r
+# Copyright (c) 2008 - 2010, Apple Inc.\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution. The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r

 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Arm11ArmLib\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Arm11ArmLib\r

diff --git a/ArmPkg/Library/ArmLib/Arm11/Arm11ArmLibPrePi.inf b/ArmPkg/Library/ArmLib/Arm11/Arm11ArmLibPrePi.inf
index 040179e445184b1abb1e3a6f548d6ed743609b8e..11443d8358c96161d640ef6eee4fac28d2e2734f 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm11/Arm11ArmLibPrePi.inf
+++ b/ArmPkg/Library/ArmLib/Arm11/Arm11ArmLibPrePi.inf
@@ -1,4 +1,18 @@
-#%HEADER%\r
+#/** @file\r
+# Semihosting  serail port lib\r
+#\r
+# Copyright (c) 2008 - 2010, Apple Inc.\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution. The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r

 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Arm11ArmLib\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Arm11ArmLib\r

diff --git a/ArmPkg/Library/ArmLib/Arm11/Arm11Support.S b/ArmPkg/Library/ArmLib/Arm11/Arm11Support.S
index eec8f20b4e7872a462806ad13435602d946c4354..e3b7746317382804e7799fc5850764389cc2eb0c 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm11/Arm11Support.S
+++ b/ArmPkg/Library/ArmLib/Arm11/Arm11Support.S
@@ -23,6 +23,7 @@
 .globl ASM_PFX(ArmCleanInvalidateDataCacheEntryByMVA)
 .globl ASM_PFX(ArmEnableMmu)
 .globl ASM_PFX(ArmDisableMmu)
 .globl ASM_PFX(ArmCleanInvalidateDataCacheEntryByMVA)
 .globl ASM_PFX(ArmEnableMmu)
 .globl ASM_PFX(ArmDisableMmu)

+.globl ASM_PFX(ArmMmuEnabled)

 .globl ASM_PFX(ArmEnableDataCache)
 .globl ASM_PFX(ArmDisableDataCache)
 .globl ASM_PFX(ArmEnableInstructionCache)
 .globl ASM_PFX(ArmEnableDataCache)
 .globl ASM_PFX(ArmDisableDataCache)
 .globl ASM_PFX(ArmEnableInstructionCache)


@@ -76,6 +77,11 @@ ASM_PFX(ArmEnableMmu):
   mcr     p15,0,R0,c1,c0,0
   bx      LR
 
   mcr     p15,0,R0,c1,c0,0
   bx      LR
 

+ASM_PFX(ArmMmuEnabled):
+  mrc     p15,0,R0,c1,c0,0
+  and     R0,R0,#1
+  bx      LR
+

 ASM_PFX(ArmDisableMmu):
   mrc     p15,0,R0,c1,c0,0
   bic     R0,R0,#1
 ASM_PFX(ArmDisableMmu):
   mrc     p15,0,R0,c1,c0,0
   bic     R0,R0,#1

diff --git a/ArmPkg/Library/ArmLib/Arm11/Arm11Support.asm b/ArmPkg/Library/ArmLib/Arm11/Arm11Support.asm
index e0be8f0c07f4cfa9125e5d5fadb99c3afc29d002..a2ed2e6f2a426b07908962d4e2f42ca32599c519 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm11/Arm11Support.asm
+++ b/ArmPkg/Library/ArmLib/Arm11/Arm11Support.asm
@@ -21,6 +21,7 @@
     EXPORT  ArmCleanInvalidateDataCacheEntryByMVA
     EXPORT  ArmEnableMmu
     EXPORT  ArmDisableMmu
     EXPORT  ArmCleanInvalidateDataCacheEntryByMVA
     EXPORT  ArmEnableMmu
     EXPORT  ArmDisableMmu

+    EXPORT  ArmMmuEnabled

     EXPORT  ArmEnableDataCache
     EXPORT  ArmDisableDataCache
     EXPORT  ArmEnableInstructionCache
     EXPORT  ArmEnableDataCache
     EXPORT  ArmDisableDataCache
     EXPORT  ArmEnableInstructionCache


@@ -80,6 +81,11 @@ ArmEnableMmu
   mcr     p15,0,R0,c1,c0,0
   bx      LR
 
   mcr     p15,0,R0,c1,c0,0
   bx      LR
 

+ArmMmuEnabled
+  mrc     p15,0,R0,c1,c0,0
+  and     R0,R0,#1
+  bx      LR
+

 ArmDisableMmu
   mrc     p15,0,R0,c1,c0,0
   bic     R0,R0,#1
 ArmDisableMmu
   mrc     p15,0,R0,c1,c0,0
   bic     R0,R0,#1

diff --git a/ArmPkg/Library/ArmLib/Arm9/Arm9ArmLib.inf b/ArmPkg/Library/ArmLib/Arm9/Arm9ArmLib.inf
index 9a940394e2714027e85d5ecf90edc2a22b763474..467e9ba621dd8165df81b7ef4ec3490b7c0aa1d9 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm9/Arm9ArmLib.inf
+++ b/ArmPkg/Library/ArmLib/Arm9/Arm9ArmLib.inf
@@ -1,4 +1,18 @@
-#%HEADER%\r
+#/** @file\r
+# Semihosting  serail port lib\r
+#\r
+# Copyright (c) 2008 - 2010, Apple Inc.\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution. The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r

 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Arm9ArmLib\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Arm9ArmLib\r

diff --git a/ArmPkg/Library/ArmLib/Arm9/Arm9ArmLibPrePi.inf b/ArmPkg/Library/ArmLib/Arm9/Arm9ArmLibPrePi.inf
index 909ce27616f2edfa8116b6a3b1af0355320dc073..900e20423dc9ca548bbf38b7e41320a4264c48dd 100755 (executable)
--- a/ArmPkg/Library/ArmLib/Arm9/Arm9ArmLibPrePi.inf
+++ b/ArmPkg/Library/ArmLib/Arm9/Arm9ArmLibPrePi.inf
@@ -1,4 +1,18 @@
-#%HEADER%\r
+#/** @file\r
+# Semihosting  serail port lib\r
+#\r
+# Copyright (c) 2008 - 2010, Apple Inc.\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution. The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r

 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Arm9ArmLibPrePi\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Arm9ArmLibPrePi\r

diff --git a/ArmPkg/Library/ArmLib/Arm9/Arm9Support.S b/ArmPkg/Library/ArmLib/Arm9/Arm9Support.S
index 5c9afe9347704a55b65fad93b06f42b88c3b936f..d76afb90f596d4341f8e3b2688d43275d3b59f0d 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm9/Arm9Support.S
+++ b/ArmPkg/Library/ArmLib/Arm9/Arm9Support.S
@@ -23,6 +23,7 @@
 .globl ASM_PFX(ArmCleanInvalidateDataCacheEntryByMVA)
 .globl ASM_PFX(ArmEnableMmu)
 .globl ASM_PFX(ArmDisableMmu)
 .globl ASM_PFX(ArmCleanInvalidateDataCacheEntryByMVA)
 .globl ASM_PFX(ArmEnableMmu)
 .globl ASM_PFX(ArmDisableMmu)

+.globl ASM_PFX(ArmMmuEnabled)

 .globl ASM_PFX(ArmEnableDataCache)
 .globl ASM_PFX(ArmDisableDataCache)
 .globl ASM_PFX(ArmEnableInstructionCache)
 .globl ASM_PFX(ArmEnableDataCache)
 .globl ASM_PFX(ArmDisableDataCache)
 .globl ASM_PFX(ArmEnableInstructionCache)


@@ -75,6 +76,11 @@ ASM_PFX(ArmEnableMmu):
   mcr     p15,0,R0,c1,c0,0
   bx      LR
 
   mcr     p15,0,R0,c1,c0,0
   bx      LR
 

+ASM_PFX(ArmMmuEnabled):
+  mrc     p15,0,R0,c1,c0,0
+  and     R0,R0,#1
+  bx      LR
+

 ASM_PFX(ArmDisableMmu):
   mrc     p15,0,R0,c1,c0,0
   bic     R0,R0,#1
 ASM_PFX(ArmDisableMmu):
   mrc     p15,0,R0,c1,c0,0
   bic     R0,R0,#1

diff --git a/ArmPkg/Library/ArmLib/Arm9/Arm9Support.asm b/ArmPkg/Library/ArmLib/Arm9/Arm9Support.asm
index 3204d6607f62401632437af1098cd16815a16312..82634c7929562b04f95e25febf34c149304f9eba 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm9/Arm9Support.asm
+++ b/ArmPkg/Library/ArmLib/Arm9/Arm9Support.asm
@@ -21,6 +21,7 @@
     EXPORT  ArmCleanInvalidateDataCacheEntryByMVA
     EXPORT  ArmEnableMmu
     EXPORT  ArmDisableMmu
     EXPORT  ArmCleanInvalidateDataCacheEntryByMVA
     EXPORT  ArmEnableMmu
     EXPORT  ArmDisableMmu

+    EXPORT  ArmMmuEnabled

     EXPORT  ArmEnableDataCache
     EXPORT  ArmDisableDataCache
     EXPORT  ArmEnableInstructionCache
     EXPORT  ArmEnableDataCache
     EXPORT  ArmDisableDataCache
     EXPORT  ArmEnableInstructionCache


@@ -77,6 +78,11 @@ ArmEnableMmu
   mcr     p15,0,R0,c1,c0,0
   bx      LR
 
   mcr     p15,0,R0,c1,c0,0
   bx      LR
 

+ArmMmuEnabled
+  mrc     p15,0,R0,c1,c0,0
+  and     R0,R0,#1
+  bx      LR
+

 ArmDisableMmu
   mrc     p15,0,R0,c1,c0,0
   bic     R0,R0,#1
 ArmDisableMmu
   mrc     p15,0,R0,c1,c0,0
   bic     R0,R0,#1

diff --git a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexALib.c b/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexALib.c
index 4dfa18db58fbd0aa4ef5a83629f9ec6d186c481f..c9bc49d040ec834a1a7b6f7c8535103c72c6f563 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexALib.c
+++ b/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexALib.c
@@ -50,8 +50,7 @@ FillTranslationTable (
   Entry    = TRANSLATION_TABLE_ENTRY_FOR_VIRTUAL_ADDRESS(TranslationTable, MemoryRegion->VirtualBase);
   Sections = MemoryRegion->Length / TT_DESCRIPTOR_SECTION_SIZE;
   
   Entry    = TRANSLATION_TABLE_ENTRY_FOR_VIRTUAL_ADDRESS(TranslationTable, MemoryRegion->VirtualBase);
   Sections = MemoryRegion->Length / TT_DESCRIPTOR_SECTION_SIZE;
   

-  for (Index = 0; Index < Sections; Index++)
-  {
+  for (Index = 0; Index < Sections; Index++) {

     *Entry++     =  TT_DESCRIPTOR_SECTION_BASE_ADDRESS(PhysicalBase) | Attributes;
     PhysicalBase += TT_DESCRIPTOR_SECTION_SIZE;
   }
     *Entry++     =  TT_DESCRIPTOR_SECTION_BASE_ADDRESS(PhysicalBase) | Attributes;
     PhysicalBase += TT_DESCRIPTOR_SECTION_SIZE;
   }

diff --git a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.S b/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.S
index 0e24f6341c120585cba33de89978b8335dc9849e..90d2c4b92fa8c6afd66c9001565df7f9dbd57bc3 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.S
+++ b/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.S
@@ -24,6 +24,7 @@
 .globl ASM_PFX(ArmDrainWriteBuffer)
 .globl ASM_PFX(ArmEnableMmu)
 .globl ASM_PFX(ArmDisableMmu)
 .globl ASM_PFX(ArmDrainWriteBuffer)
 .globl ASM_PFX(ArmEnableMmu)
 .globl ASM_PFX(ArmDisableMmu)

+.globl ASM_PFX(ArmMmuEnabled)

 .globl ASM_PFX(ArmEnableDataCache)
 .globl ASM_PFX(ArmDisableDataCache)
 .globl ASM_PFX(ArmEnableInstructionCache)
 .globl ASM_PFX(ArmEnableDataCache)
 .globl ASM_PFX(ArmDisableDataCache)
 .globl ASM_PFX(ArmEnableInstructionCache)


@@ -85,6 +86,12 @@ ASM_PFX(ArmEnableMmu):
   mcr     p15,0,R0,c1,c0,0
   bx      LR
 
   mcr     p15,0,R0,c1,c0,0
   bx      LR
 

+ASM_PFX(ArmMmuEnabled):
+  mrc     p15,0,R0,c1,c0,0
+  and     R0,R0,#1
+  bx      LR
+
+

 ASM_PFX(ArmDisableMmu):
   mov     R0,#0
   mcr     p15,0,R0,c13,c0,0     @FCSE PID register must be cleared before disabling MMU
 ASM_PFX(ArmDisableMmu):
   mov     R0,#0
   mcr     p15,0,R0,c13,c0,0     @FCSE PID register must be cleared before disabling MMU

diff --git a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.asm b/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.asm
index dbd8bd246abde2bfba695eae97ca381dda89deb5..700942dd17d9361db0287e84ecb10a1c9a6fbd53 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.asm
+++ b/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.asm
@@ -22,6 +22,7 @@
     EXPORT  ArmDrainWriteBuffer
     EXPORT  ArmEnableMmu
     EXPORT  ArmDisableMmu
     EXPORT  ArmDrainWriteBuffer
     EXPORT  ArmEnableMmu
     EXPORT  ArmDisableMmu

+    EXPORT  ArmMmuEnabled

     EXPORT  ArmEnableDataCache
     EXPORT  ArmDisableDataCache
     EXPORT  ArmEnableInstructionCache
     EXPORT  ArmEnableDataCache
     EXPORT  ArmDisableDataCache
     EXPORT  ArmEnableInstructionCache


@@ -86,6 +87,11 @@ ArmEnableMmu
   mcr     p15,0,R0,c1,c0,0
   bx      LR
 
   mcr     p15,0,R0,c1,c0,0
   bx      LR
 

+ArmMmuEnabled
+  mrc     p15,0,R0,c1,c0,0
+  and     R0,R0,#1
+  bx      LR
+

 ArmDisableMmu
   mov     R0,#0
   mcr     p15,0,R0,c13,c0,0     ;FCSE PID register must be cleared before disabling MMU
 ArmDisableMmu
   mov     R0,#0
   mcr     p15,0,R0,c13,c0,0     ;FCSE PID register must be cleared before disabling MMU

diff --git a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf b/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf
index 54b77e31b4d2aebf5ab934672ac3047ac6b423a5..de3edb0be7a12c9197b9b8473cef998448d3cc66 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf
+++ b/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf
@@ -1,4 +1,18 @@
-#%HEADER%\r
+#/** @file\r
+# Semihosting  serail port lib\r
+#\r
+# Copyright (c) 2008 - 2010, Apple Inc.\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution. The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r

 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = ArmCortexArmLib\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = ArmCortexArmLib\r

diff --git a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLibPrePi.inf b/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLibPrePi.inf
index 450dfe5936ddbc712f2e63865d49bfd83c37ff59..94436bb08dbd8aec3a95b01c2d05c42a2644c165 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLibPrePi.inf
+++ b/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLibPrePi.inf
@@ -1,4 +1,18 @@
-#%HEADER%\r
+#/** @file\r
+# Semihosting  serail port lib\r
+#\r
+# Copyright (c) 2008 - 2010, Apple Inc.\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution. The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r

 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = ArmCortexArmLibPrePi\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = ArmCortexArmLibPrePi\r

diff --git a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Common/ArmLibSupport.S
index d80100c788b660ca8f48ebf6b04b8baf4e8add06..57d27345285083beaaa6dac9c58086e35b9facb7 100644 (file)
--- a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.S
+++ b/ArmPkg/Library/ArmLib/Common/ArmLibSupport.S
@@ -21,6 +21,7 @@
 .globl ASM_PFX(ArmGetInterruptState)
 .globl ASM_PFX(ArmInvalidateTlb)
 .globl ASM_PFX(ArmSetTranslationTableBaseAddress)
 .globl ASM_PFX(ArmGetInterruptState)
 .globl ASM_PFX(ArmInvalidateTlb)
 .globl ASM_PFX(ArmSetTranslationTableBaseAddress)

+.globl ASM_PFX(ArmGetTranslationTableBaseAddress)

 .globl ASM_PFX(ArmSetDomainAccessControl)
 .globl ASM_PFX(CPSRMaskInsert)
 .globl ASM_PFX(CPSRRead)
 .globl ASM_PFX(ArmSetDomainAccessControl)
 .globl ASM_PFX(CPSRMaskInsert)
 .globl ASM_PFX(CPSRRead)


@@ -66,6 +67,11 @@ ASM_PFX(ArmSetTranslationTableBaseAddress):
   mcr     p15,0,r0,c2,c0,0
   bx      lr
 
   mcr     p15,0,r0,c2,c0,0
   bx      lr
 

+ASM_PFX(ArmGetTranslationTableBaseAddress):
+  mrc     p15,0,r0,c2,c0,0
+  bx      lr
+
+

 ASM_PFX(ArmSetDomainAccessControl):
   mcr     p15,0,r0,c3,c0,0
   bx      lr
 ASM_PFX(ArmSetDomainAccessControl):
   mcr     p15,0,r0,c3,c0,0
   bx      lr

diff --git a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm b/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm
index ec7db638afa2721ffe1b691eefeb8272b74779a9..ecae8a31a2f08137351a52331123f3bc3e3679d7 100644 (file)
--- a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm
+++ b/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm
@@ -20,6 +20,7 @@
     EXPORT  ArmGetInterruptState
     EXPORT  ArmInvalidateTlb
     EXPORT  ArmSetTranslationTableBaseAddress
     EXPORT  ArmGetInterruptState
     EXPORT  ArmInvalidateTlb
     EXPORT  ArmSetTranslationTableBaseAddress

+    EXPORT  ArmGetTranslationTableBaseAddress

     EXPORT  ArmSetDomainAccessControl
     EXPORT  CPSRMaskInsert
     EXPORT  CPSRRead
     EXPORT  ArmSetDomainAccessControl
     EXPORT  CPSRMaskInsert
     EXPORT  CPSRRead


@@ -65,6 +66,10 @@ ArmSetTranslationTableBaseAddress
   mcr     p15,0,r0,c2,c0,0
   bx      lr
 
   mcr     p15,0,r0,c2,c0,0
   bx      lr
 

+ArmSetTranslationTableBaseAddress
+  mrc     p15,0,r0,c2,c0,0
+  bx      lr
+

 ArmSetDomainAccessControl
   mcr     p15,0,r0,c3,c0,0
   bx      lr
 ArmSetDomainAccessControl
   mcr     p15,0,r0,c3,c0,0
   bx      lr

diff --git a/ArmPkg/Library/ArmLib/Null/NullArmLib.inf b/ArmPkg/Library/ArmLib/Null/NullArmLib.inf
index ff31b9cecb5094f6a24b291dab463143a4e3ef6b..304dbcb68e0843c6051444891c40019b974b81ad 100644 (file)
--- a/ArmPkg/Library/ArmLib/Null/NullArmLib.inf
+++ b/ArmPkg/Library/ArmLib/Null/NullArmLib.inf
@@ -1,4 +1,18 @@
-#%HEADER%\r
+#/** @file\r
+# Semihosting  serail port lib\r
+#\r
+# Copyright (c) 2008 - 2010, Apple Inc.\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution. The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r

 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = NullArmLib\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = NullArmLib\r

diff --git a/ArmPkg/Library/SemiHostingDebugLib/SemiHostingDebugLib.inf b/ArmPkg/Library/SemiHostingDebugLib/SemiHostingDebugLib.inf
index 683f03f2f369c659c86fb93e09ca9de50425e7d3..d661c37e17536c31845de1269d7d646a30062f4b 100644 (file)
--- a/ArmPkg/Library/SemiHostingDebugLib/SemiHostingDebugLib.inf
+++ b/ArmPkg/Library/SemiHostingDebugLib/SemiHostingDebugLib.inf
@@ -1,4 +1,4 @@
-#%HEADER%\r
+\r

 #/** @file\r
 # Debug Library for UEFI drivers\r
 #\r
 #/** @file\r
 # Debug Library for UEFI drivers\r
 #\r

diff --git a/ArmPkg/Library/SemiHostingSerialPortLib/SemiHostingSerialPortLib.inf b/ArmPkg/Library/SemiHostingSerialPortLib/SemiHostingSerialPortLib.inf
index c0a540342a427c17775ae00e8472c5113b8f2ad0..d0b7d0ad9dc0b28569a405648a048d5474cfbf07 100644 (file)
--- a/ArmPkg/Library/SemiHostingSerialPortLib/SemiHostingSerialPortLib.inf
+++ b/ArmPkg/Library/SemiHostingSerialPortLib/SemiHostingSerialPortLib.inf
@@ -1,4 +1,3 @@
-#%HEADER%\r

 #/** @file\r
 # Semihosting  serail port lib\r
 #\r
 #/** @file\r
 # Semihosting  serail port lib\r
 #\r

diff --git a/ArmPkg/Library/SemihostLib/SemihostLib.inf b/ArmPkg/Library/SemihostLib/SemihostLib.inf
index cb278083c004d8d9fb3764a6fbbe2f393b147466..d05188c77126ea7600772589114e89eb91d70d0b 100644 (file)
--- a/ArmPkg/Library/SemihostLib/SemihostLib.inf
+++ b/ArmPkg/Library/SemihostLib/SemihostLib.inf
@@ -1,4 +1,18 @@
-#%HEADER%\r
+#/** @file\r
+# Semihosting  serail port lib\r
+#\r
+# Copyright (c) 2008 - 2010, Apple Inc.\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution. The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r

 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = SemihostLib\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = SemihostLib\r

diff --git a/ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf b/ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
index 1a62eb4231be903a9eaccb6bafb51c28ee70ce7e..7522b1e3583c2b207e9e968f6a437e8b5e849428 100644 (file)
--- a/ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
+++ b/ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf
@@ -1,4 +1,18 @@
-#%HEADER%\r
+#/** @file\r
+# Semihosting  serail port lib\r
+#\r
+# Copyright (c) 2008 - 2010, Apple Inc.\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution. The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r

 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = UncachedMemoryAllocationLib\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = UncachedMemoryAllocationLib\r