summaryrefslogtreecommitdiff
path: root/ArmPkg/Library
diff options
context:
space:
mode:
authorandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2010-02-18 01:57:13 +0000
committerandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2010-02-18 01:57:13 +0000
commit5dea9bd6e60a2571c9b89a0b9aa3d163d665810e (patch)
tree7ec3d842e9da60e6ae85de1357324ad718d2583c /ArmPkg/Library
parent3cfc8576473e998236872c4c41805ba7016f8989 (diff)
downloadedk2-platforms-5dea9bd6e60a2571c9b89a0b9aa3d163d665810e.tar.xz
Change Cortex-A8 references to ARMv7. Cortex-A8 is a branded implementation of the ARMv7 processor architecture.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10022 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmPkg/Library')
-rw-r--r--ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c (renamed from ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexALib.c)16
-rw-r--r--ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h (renamed from ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexALib.h)8
-rw-r--r--ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf (renamed from ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf)8
-rw-r--r--ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf (renamed from ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLibPrePi.inf)8
-rw-r--r--ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S (renamed from ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.S)0
-rw-r--r--ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm (renamed from ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.asm)0
6 files changed, 20 insertions, 20 deletions
diff --git a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexALib.c b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c
index c9bc49d040..12ef56c5e6 100644
--- a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexALib.c
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c
@@ -12,12 +12,12 @@
**/
-#include <Chipset/Cortex-A8.h>
+#include <Chipset/ArmV7.h>
#include <Library/ArmLib.h>
#include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
-#include "ArmCortexALib.h"
+#include "ArmV7Lib.h"
VOID
FillTranslationTable (
@@ -220,8 +220,8 @@ ArmInstructionCacheLineLength (
}
VOID
-ArmCortexADataCacheOperation (
- IN ARM_CORTEX_A_CACHE_OPERATION DataCacheOperation
+ArmV7DataCacheOperation (
+ IN ARM_V7_CACHE_OPERATION DataCacheOperation
)
{
UINTN Set;
@@ -236,7 +236,7 @@ ArmCortexADataCacheOperation (
SetCount = ArmDataCacheSets();
WayCount = ArmDataCacheAssociativity();
- // Cortex-A8 Manual, System Control Coprocessor chapter
+ // ARMv7 Manual, System Control Coprocessor chapter
SetShift = 6;
WayShift = 32 - LowBitSet32 ((UINT32)WayCount);
@@ -265,7 +265,7 @@ ArmInvalidateDataCache (
VOID
)
{
- ArmCortexADataCacheOperation(ArmInvalidateDataCacheEntryBySetWay);
+ ArmV7DataCacheOperation(ArmInvalidateDataCacheEntryBySetWay);
}
VOID
@@ -274,7 +274,7 @@ ArmCleanInvalidateDataCache (
VOID
)
{
- ArmCortexADataCacheOperation(ArmCleanInvalidateDataCacheEntryBySetWay);
+ ArmV7DataCacheOperation(ArmCleanInvalidateDataCacheEntryBySetWay);
}
VOID
@@ -283,5 +283,5 @@ ArmCleanDataCache (
VOID
)
{
- ArmCortexADataCacheOperation(ArmCleanDataCacheEntryBySetWay);
+ ArmV7DataCacheOperation(ArmCleanDataCacheEntryBySetWay);
}
diff --git a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexALib.h b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h
index afe98bdfa2..970b6f1e34 100644
--- a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexALib.h
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h
@@ -12,10 +12,10 @@
**/
-#ifndef __ARMCORTEXALIB_H__
-#define __ARMCORTEXALIB_H__
+#ifndef __ARM_V7_LIB_H__
+#define __ARM_V7_LIB_H__
-typedef VOID (*ARM_CORTEX_A_CACHE_OPERATION)(UINT32);
+typedef VOID (*ARM_V7_CACHE_OPERATION)(UINT32);
VOID
EFIAPI
@@ -41,5 +41,5 @@ ArmCleanInvalidateDataCacheEntryBySetWay (
IN UINT32 SetWayFormat
);
-#endif // __ARMCORTEXALIB_H__
+#endif // __ARM_V7_LIB_H__
diff --git a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
index de3edb0be7..bcd7d3d40f 100644
--- a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
@@ -15,7 +15,7 @@
[Defines]
INF_VERSION = 0x00010005
- BASE_NAME = ArmCortexArmLib
+ BASE_NAME = ArmV7Lib
FILE_GUID = 411cdfd8-f964-4b9d-a3e3-1719a9c15559
MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0
@@ -26,10 +26,10 @@
../Common/ArmLibSupport.asm | RVCT
../Common/ArmLib.c
- ArmCortexASupport.S | GCC
- ArmCortexASupport.asm | RVCT
+ ArmV7Support.S | GCC
+ ArmV7Support.asm | RVCT
- ArmCortexALib.c
+ ArmV7Lib.c
[Packages]
ArmPkg/ArmPkg.dec
diff --git a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLibPrePi.inf b/ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf
index 94436bb08d..38c791b4eb 100644
--- a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLibPrePi.inf
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf
@@ -15,7 +15,7 @@
[Defines]
INF_VERSION = 0x00010005
- BASE_NAME = ArmCortexArmLibPrePi
+ BASE_NAME = ArmV7LibPrePi
FILE_GUID = A150FA0C-F4E8-4207-9BEB-CD6DFB430D73
MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0
@@ -26,10 +26,10 @@
../Common/ArmLibSupport.asm | RVCT
../Common/ArmLib.c
- ArmCortexASupport.S | GCC
- ArmCortexASupport.asm | RVCT
+ ArmV7Support.S | GCC
+ ArmV7Support.asm | RVCT
- ArmCortexALib.c
+ ArmV7Lib.c
[Packages]
ArmPkg/ArmPkg.dec
diff --git a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.S b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
index 90d2c4b92f..90d2c4b92f 100644
--- a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.S
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
diff --git a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.asm b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm
index 700942dd17..700942dd17 100644
--- a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.asm
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm