diff options
author | Marcin Wojtas <mw@semihalf.com> | 2017-12-08 15:57:32 +0100 |
---|---|---|
committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-12-08 15:26:05 +0000 |
commit | 46e1f8149e3e84f520f0a145a7e6bd515f7aa714 (patch) | |
tree | a688f339a87e977ce61606336510758fdae9865e /Silicon/Marvell/Armada7k8k/Library | |
parent | a9ac0c46818954873134960d6bb304c743869327 (diff) | |
download | edk2-platforms-46e1f8149e3e84f520f0a145a7e6bd515f7aa714.tar.xz |
Marvell/Armada7k8k: Use '7k8k' prefix in the SoC drivers/libraries
As a part of files reorganization, switch to using '7k8k'
in all SoC-specific driver/library code instead of
'70x0'/'7040', so that to ensure consistent naming for
entire SoC family.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Diffstat (limited to 'Silicon/Marvell/Armada7k8k/Library')
-rw-r--r-- | Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S (renamed from Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/AArch64/ArmPlatformHelper.S) | 0 | ||||
-rw-r--r-- | Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S (renamed from Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/ARM/ArmPlatformHelper.S) | 0 | ||||
-rw-r--r-- | Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c (renamed from Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.c) | 6 | ||||
-rw-r--r-- | Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.inf (renamed from Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.inf) | 10 | ||||
-rw-r--r-- | Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLibMem.c (renamed from Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0LibMem.c) | 2 | ||||
-rw-r--r-- | Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLibMem.h (renamed from Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0LibMem.h) | 0 | ||||
-rw-r--r-- | Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c (renamed from Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.c) | 0 | ||||
-rw-r--r-- | Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf (renamed from Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf) | 4 |
8 files changed, 11 insertions, 11 deletions
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/AArch64/ArmPlatformHelper.S b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S index 72f8cfce77..72f8cfce77 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/AArch64/ArmPlatformHelper.S +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/ARM/ArmPlatformHelper.S b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S index 21459e50a7..21459e50a7 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/ARM/ArmPlatformHelper.S +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c index b2b415571c..233f7b14a4 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.c +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c @@ -17,7 +17,7 @@ #include <Library/ArmPlatformLib.h>
#include <Ppi/ArmMpCoreInfo.h>
-ARM_CORE_INFO mArmada7040MpCoreInfoTable[] = {
+ARM_CORE_INFO mArmada7k8kMpCoreInfoTable[] = {
{
// Cluster 0, Core 0
0x0, 0x0,
@@ -96,8 +96,8 @@ PrePeiCoreGetMpCoreInfo ( )
{
if (ArmIsMpCore()) {
- *CoreCount = sizeof(mArmada7040MpCoreInfoTable) / sizeof(ARM_CORE_INFO);
- *ArmCoreTable = mArmada7040MpCoreInfoTable;
+ *CoreCount = sizeof(mArmada7k8kMpCoreInfoTable) / sizeof(ARM_CORE_INFO);
+ *ArmCoreTable = mArmada7k8kMpCoreInfoTable;
return EFI_SUCCESS;
} else {
return EFI_UNSUPPORTED;
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.inf b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.inf index 4d4edc8565..d38b467cbe 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.inf +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.inf @@ -32,17 +32,17 @@ [Defines]
INF_VERSION = 0x00010005
- BASE_NAME = Armada7040Lib
+ BASE_NAME = Armada7k8kLib
FILE_GUID = 3f29b642-4a49-4dfd-8f4a-205dd38432bb
MODULE_TYPE = BASE
VERSION_STRING = 1.0
LIBRARY_CLASS = ArmPlatformLib
[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
ArmPkg/ArmPkg.dec
ArmPlatformPkg/ArmPlatformPkg.dec
+ MdeModulePkg/MdeModulePkg.dec
+ MdePkg/MdePkg.dec
Silicon/Marvell/Marvell.dec
[LibraryClasses]
@@ -54,8 +54,8 @@ UtmiPhyLib
[Sources.common]
- Armada70x0Lib.c
- Armada70x0LibMem.c
+ Armada7k8kLib.c
+ Armada7k8kLibMem.c
[Sources.AArch64]
AArch64/ArmPlatformHelper.S
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0LibMem.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLibMem.c index f384415d7a..2a4f5ad498 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0LibMem.c +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLibMem.c @@ -39,7 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <Library/IoLib.h>
#include <Library/MemoryAllocationLib.h>
-#include "Armada70x0LibMem.h"
+#include "Armada7k8kLibMem.h"
// The total number of descriptors, including the final "end-of-table" descriptor.
#define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS 16
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0LibMem.h b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLibMem.h index cc30e4aeed..cc30e4aeed 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0LibMem.h +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLibMem.h diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c index 53119f4150..53119f4150 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.c +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf index adc5b9ac8d..096495dea9 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf @@ -15,14 +15,14 @@ [Defines]
INF_VERSION = 0x00010019
- BASE_NAME = Armada70x0MemoryInitPeiLib
+ BASE_NAME = Armada7k8kMemoryInitPeiLib
FILE_GUID = abc4e8a7-89a7-4aea-92bc-0e9421c4a473
MODULE_TYPE = BASE
VERSION_STRING = 1.0
LIBRARY_CLASS = MemoryInitPeiLib|SEC PEIM
[Sources]
- Armada70x0MemoryInitPeiLib.c
+ Armada7k8kMemoryInitPeiLib.c
[Packages]
ArmPkg/ArmPkg.dec
|