diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index b0d2c8f227..0afa51c25e 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -50,7 +50,7 @@ DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.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 ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf @@ -64,8 +64,8 @@ ArmPkg/Library/ArmLib/Arm11/Arm11ArmLibPrePi.inf ArmPkg/Library/ArmLib/Arm9/Arm9ArmLib.inf ArmPkg/Library/ArmLib/Arm9/Arm9ArmLibPrePi.inf - ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf - ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLibPrePi.inf + ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf + ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf ArmPkg/Library/ArmLib/Null/NullArmLib.inf ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf ArmPkg/Library/SemiHostingDebugLib/SemiHostingDebugLib.inf diff --git a/ArmPkg/Include/Chipset/Cortex-A8.h b/ArmPkg/Include/Chipset/ArmV7.h similarity index 97% rename from ArmPkg/Include/Chipset/Cortex-A8.h rename to ArmPkg/Include/Chipset/ArmV7.h index 75ce397a79..a097ae3f55 100644 --- a/ArmPkg/Include/Chipset/Cortex-A8.h +++ b/ArmPkg/Include/Chipset/ArmV7.h @@ -12,8 +12,8 @@ **/ -#ifndef __CORTEX_A8_H__ -#define __CORTEX_A8_H__ +#ifndef __ARM_V7_H__ +#define __ARM_V7_H__ // Domain Access Control Register #define DOMAIN_ACCESS_CONTROL_MASK(a) (3UL << (2 * (a))) @@ -101,4 +101,4 @@ TT_DESCRIPTOR_SECTION_AP_RW_RW | \ TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_CACHEABLE) -#endif // __CORTEX_A8_H__ +#endif // __ARM_V7_H__ diff --git a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexALib.c b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c similarity index 93% rename from ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexALib.c rename to 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 +#include #include #include #include #include -#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 similarity index 85% rename from ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexALib.h rename to 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 similarity index 86% rename from ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf rename to 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 similarity index 85% rename from ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLibPrePi.inf rename to 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 similarity index 100% rename from ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.S rename to ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S diff --git a/ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.asm b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm similarity index 100% rename from ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexASupport.asm rename to ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc index 371a2b8f49..5769ed5f37 100644 --- a/BeagleBoardPkg/BeagleBoardPkg.dsc +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc @@ -38,7 +38,7 @@ DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif - ArmLib|ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf + ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf BaseLib|MdePkg/Library/BaseLib/BaseLib.inf @@ -114,7 +114,7 @@ [LibraryClasses.common.SEC] - ArmLib|ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLibPrePi.inf + ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf @@ -171,7 +171,7 @@ XCODE:*_*_ARM_ARCHDLINK_FLAGS == -arch armv6 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 ################################################################################ diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc index 6586114dc2..2efe36f255 100644 --- a/Omap35xxPkg/Omap35xxPkg.dsc +++ b/Omap35xxPkg/Omap35xxPkg.dsc @@ -33,7 +33,7 @@ [LibraryClasses.common] 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 BaseLib|MdePkg/Library/BaseLib/BaseLib.inf @@ -90,8 +90,8 @@ XCODE:*_*_ARM_ARCHASM_FLAGS == -arch armv6 XCODE:*_*_ARM_ARCHDLINK_FLAGS == -arch armv6 - RVCT:*_*_ARM_ARCHCC_FLAGS == --cpu Cortex-A8 - RVCT:*_*_ARM_ARCHASM_FLAGS == --cpu Cortex-A8 + RVCT:*_*_ARM_ARCHCC_FLAGS == --cpu 7-A + RVCT:*_*_ARM_ARCHASM_FLAGS == --cpu 7-A ################################################################################