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>

11 files changed, 24 insertions, 24 deletions

diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 75717e915b..7d87766e34 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -32,7 +32,7 @@
 #SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #

 [LibraryClasses.common]

-  ArmPlatformLib|Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.inf

+  ArmPlatformLib|Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.inf

   ComPhyLib|Silicon/Marvell/Library/ComPhyLib/ComPhyLib.inf

   MppLib|Silicon/Marvell/Library/MppLib/MppLib.inf

   NorFlashInfoLib|EmbeddedPkg/Library/NorFlashInfoLib/NorFlashInfoLib.inf

@@ -149,7 +149,7 @@
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

 

 [LibraryClasses.common.SEC, LibraryClasses.common.PEIM]

-  MemoryInitPeiLib|Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf

+  MemoryInitPeiLib|Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf

   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

 

 [LibraryClasses.common.DXE_CORE]

@@ -413,7 +413,7 @@
   Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf

   Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf

   Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf

-  Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf

+  Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf

 

   # Network support

   MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf

diff --git a/Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.c b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c
index 014443d130..2cbc3e4bfb 100644
--- a/Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.c
+++ b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c
@@ -87,7 +87,7 @@ STATIC EFI_PHYSICAL_ADDRESS                     mTrngBaseAddress;
 STATIC

 EFI_STATUS

 EFIAPI

-Armada70x0RngGetInfo (

+Armada7k8kRngGetInfo (

   IN      EFI_RNG_PROTOCOL        *This,

   IN OUT  UINTN                   *RNGAlgorithmListSize,

   OUT     EFI_RNG_ALGORITHM       *RNGAlgorithmList

@@ -171,7 +171,7 @@ GetTrngData (
 STATIC

 EFI_STATUS

 EFIAPI

-Armada70x0RngGetRNG (

+Armada7k8kRngGetRNG (

   IN EFI_RNG_PROTOCOL            *This,

   IN EFI_RNG_ALGORITHM           *RNGAlgorithm, OPTIONAL

   IN UINTN                       RNGValueLength,

@@ -207,9 +207,9 @@ Armada70x0RngGetRNG (
   return EFI_SUCCESS;

 }

 

-STATIC EFI_RNG_PROTOCOL mArmada70x0RngProtocol = {

-  Armada70x0RngGetInfo,

-  Armada70x0RngGetRNG

+STATIC EFI_RNG_PROTOCOL mArmada7k8kRngProtocol = {

+  Armada7k8kRngGetInfo,

+  Armada7k8kRngGetRNG

 };

 

 //

@@ -217,7 +217,7 @@ STATIC EFI_RNG_PROTOCOL mArmada70x0RngProtocol = {
 //

 EFI_STATUS

 EFIAPI

-Armada70x0RngDxeEntryPoint (

+Armada7k8kRngDxeEntryPoint (

   IN EFI_HANDLE       ImageHandle,

   IN EFI_SYSTEM_TABLE *SystemTable

   )

@@ -249,7 +249,7 @@ Armada70x0RngDxeEntryPoint (
   return SystemTable->BootServices->InstallMultipleProtocolInterfaces (

                                       &ImageHandle,

                                       &gEfiRngProtocolGuid,

-                                      &mArmada70x0RngProtocol,

+                                      &mArmada7k8kRngProtocol,

                                       NULL

                                       );

 }

diff --git a/Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
index 3d74c8e965..e6561f3cb8 100644
--- a/Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf
+++ b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
@@ -15,14 +15,14 @@
 

 [Defines]

   INF_VERSION                    = 0x00010019

-  BASE_NAME                      = Armada70x0RngDxe

+  BASE_NAME                      = Armada7k8kRngDxe

   FILE_GUID                      = dd87096a-cae5-4328-bec1-2ddb755f2e08

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

-  ENTRY_POINT                    = Armada70x0RngDxeEntryPoint

+  ENTRY_POINT                    = Armada7k8kRngDxeEntryPoint

 

 [Sources]

-  Armada70x0RngDxe.c

+  Armada7k8kRngDxe.c

 

 [Packages]

   MdePkg/MdePkg.dec

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