tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
andrewfish 2010-02-18 01:57:13 +00:00
parent 3cfc857647
commit 5dea9bd6e6
10 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ArmPkg/ArmPkg.dsc
View File

@ -50,7 +50,7 @@
DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
DefaultExceptioHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf DefaultExceptioHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
ArmLib|ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf
@ -64,8 +64,8 @@
ArmPkg/Library/ArmLib/Arm11/Arm11ArmLibPrePi.inf ArmPkg/Library/ArmLib/Arm11/Arm11ArmLibPrePi.inf
ArmPkg/Library/ArmLib/Arm9/Arm9ArmLib.inf ArmPkg/Library/ArmLib/Arm9/Arm9ArmLib.inf
ArmPkg/Library/ArmLib/Arm9/Arm9ArmLibPrePi.inf ArmPkg/Library/ArmLib/Arm9/Arm9ArmLibPrePi.inf
ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLibPrePi.inf ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf
ArmPkg/Library/ArmLib/Null/NullArmLib.inf ArmPkg/Library/ArmLib/Null/NullArmLib.inf
ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
ArmPkg/Library/SemiHostingDebugLib/SemiHostingDebugLib.inf ArmPkg/Library/SemiHostingDebugLib/SemiHostingDebugLib.inf

6
ArmPkg/Include/Chipset/Cortex-A8.h → ArmPkg/Include/Chipset/ArmV7.h
View File

@ -12,8 +12,8 @@
**/ **/
#ifndef __CORTEX_A8_H__ #ifndef __ARM_V7_H__
#define __CORTEX_A8_H__ #define __ARM_V7_H__
// Domain Access Control Register // Domain Access Control Register
#define DOMAIN_ACCESS_CONTROL_MASK(a) (3UL << (2 * (a))) #define DOMAIN_ACCESS_CONTROL_MASK(a) (3UL << (2 * (a)))
@ -101,4 +101,4 @@
TT_DESCRIPTOR_SECTION_AP_RW_RW | \ TT_DESCRIPTOR_SECTION_AP_RW_RW | \
TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_CACHEABLE) TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_CACHEABLE)
#endif // __CORTEX_A8_H__ #endif // __ARM_V7_H__

16
ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexALib.c → ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c
View File

@ -12,12 +12,12 @@
**/ **/
#include <Chipset/Cortex-A8.h> #include <Chipset/ArmV7.h>
#include <Library/ArmLib.h> #include <Library/ArmLib.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>
#include "ArmCortexALib.h" #include "ArmV7Lib.h"
VOID VOID
FillTranslationTable ( FillTranslationTable (
@ -220,8 +220,8 @@ ArmInstructionCacheLineLength (
} }
VOID VOID
ArmCortexADataCacheOperation ( ArmV7DataCacheOperation (
IN ARM_CORTEX_A_CACHE_OPERATION DataCacheOperation IN ARM_V7_CACHE_OPERATION DataCacheOperation
) )
{ {
UINTN Set; UINTN Set;
@ -236,7 +236,7 @@ ArmCortexADataCacheOperation (
SetCount = ArmDataCacheSets(); SetCount = ArmDataCacheSets();
WayCount = ArmDataCacheAssociativity(); WayCount = ArmDataCacheAssociativity();
// Cortex-A8 Manual, System Control Coprocessor chapter // ARMv7 Manual, System Control Coprocessor chapter
SetShift = 6; SetShift = 6;
WayShift = 32 - LowBitSet32 ((UINT32)WayCount); WayShift = 32 - LowBitSet32 ((UINT32)WayCount);
@ -265,7 +265,7 @@ ArmInvalidateDataCache (
VOID VOID
) )
{ {
ArmCortexADataCacheOperation(ArmInvalidateDataCacheEntryBySetWay); ArmV7DataCacheOperation(ArmInvalidateDataCacheEntryBySetWay);
} }
VOID VOID
@ -274,7 +274,7 @@ ArmCleanInvalidateDataCache (
VOID VOID
) )
{ {
ArmCortexADataCacheOperation(ArmCleanInvalidateDataCacheEntryBySetWay); ArmV7DataCacheOperation(ArmCleanInvalidateDataCacheEntryBySetWay);
} }
VOID VOID
@ -283,5 +283,5 @@ ArmCleanDataCache (
VOID VOID
) )
{ {
ArmCortexADataCacheOperation(ArmCleanDataCacheEntryBySetWay); ArmV7DataCacheOperation(ArmCleanDataCacheEntryBySetWay);
} }

8
ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexALib.h → ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h
View File

@ -12,10 +12,10 @@
**/ **/
#ifndef __ARMCORTEXALIB_H__ #ifndef __ARM_V7_LIB_H__
#define __ARMCORTEXALIB_H__ #define __ARM_V7_LIB_H__
typedef VOID (*ARM_CORTEX_A_CACHE_OPERATION)(UINT32); typedef VOID (*ARM_V7_CACHE_OPERATION)(UINT32);
VOID VOID
EFIAPI EFIAPI
@ -41,5 +41,5 @@ ArmCleanInvalidateDataCacheEntryBySetWay (
IN UINT32 SetWayFormat IN UINT32 SetWayFormat
); );
#endif // __ARMCORTEXALIB_H__ #endif // __ARM_V7_LIB_H__

8
ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf → ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
View File

@ -15,7 +15,7 @@
[Defines] [Defines]
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = ArmCortexArmLib BASE_NAME = ArmV7Lib
FILE_GUID = 411cdfd8-f964-4b9d-a3e3-1719a9c15559 FILE_GUID = 411cdfd8-f964-4b9d-a3e3-1719a9c15559
MODULE_TYPE = DXE_DRIVER MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0 VERSION_STRING = 1.0
@ -26,10 +26,10 @@
../Common/ArmLibSupport.asm | RVCT ../Common/ArmLibSupport.asm | RVCT
../Common/ArmLib.c ../Common/ArmLib.c
ArmCortexASupport.S | GCC ArmV7Support.S | GCC
ArmCortexASupport.asm | RVCT ArmV7Support.asm | RVCT
ArmCortexALib.c ArmV7Lib.c
[Packages] [Packages]
ArmPkg/ArmPkg.dec ArmPkg/ArmPkg.dec

8
ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLibPrePi.inf → ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf
View File

@ -15,7 +15,7 @@
[Defines] [Defines]
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = ArmCortexArmLibPrePi BASE_NAME = ArmV7LibPrePi
FILE_GUID = A150FA0C-F4E8-4207-9BEB-CD6DFB430D73 FILE_GUID = A150FA0C-F4E8-4207-9BEB-CD6DFB430D73
MODULE_TYPE = DXE_DRIVER MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0 VERSION_STRING = 1.0
@ -26,10 +26,10 @@
../Common/ArmLibSupport.asm | RVCT ../Common/ArmLibSupport.asm | RVCT
../Common/ArmLib.c ../Common/ArmLib.c
ArmCortexASupport.S | GCC ArmV7Support.S | GCC
ArmCortexASupport.asm | RVCT ArmV7Support.asm | RVCT
ArmCortexALib.c ArmV7Lib.c
[Packages] [Packages]
ArmPkg/ArmPkg.dec ArmPkg/ArmPkg.dec

0
ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.S → ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
View File

0
ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.asm → ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm
View File

6
BeagleBoardPkg/BeagleBoardPkg.dsc
View File

@ -38,7 +38,7 @@
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
!endif !endif
ArmLib|ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
BaseLib|MdePkg/Library/BaseLib/BaseLib.inf BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
@ -114,7 +114,7 @@
[LibraryClasses.common.SEC] [LibraryClasses.common.SEC]
ArmLib|ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLibPrePi.inf ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
@ -171,7 +171,7 @@
XCODE:*_*_ARM_ARCHDLINK_FLAGS == -arch armv6 XCODE:*_*_ARM_ARCHDLINK_FLAGS == -arch armv6
XCODE:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG XCODE:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
RVCT:*_*_ARM_ARCHCC_FLAGS == --cpu Cortex-A8 --thumb RVCT:*_*_ARM_ARCHCC_FLAGS == --cpu 7-A --thumb
RVCT:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG RVCT:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
################################################################################ ################################################################################

6
Omap35xxPkg/Omap35xxPkg.dsc
View File

@ -33,7 +33,7 @@
[LibraryClasses.common] [LibraryClasses.common]
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
ArmLib|ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
BaseLib|MdePkg/Library/BaseLib/BaseLib.inf BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
@ -90,8 +90,8 @@
XCODE:*_*_ARM_ARCHASM_FLAGS == -arch armv6 XCODE:*_*_ARM_ARCHASM_FLAGS == -arch armv6
XCODE:*_*_ARM_ARCHDLINK_FLAGS == -arch armv6 XCODE:*_*_ARM_ARCHDLINK_FLAGS == -arch armv6
RVCT:*_*_ARM_ARCHCC_FLAGS == --cpu Cortex-A8 RVCT:*_*_ARM_ARCHCC_FLAGS == --cpu 7-A
RVCT:*_*_ARM_ARCHASM_FLAGS == --cpu Cortex-A8 RVCT:*_*_ARM_ARCHASM_FLAGS == --cpu 7-A
################################################################################ ################################################################################