Marvell: Reorganize file structure

In edk2-platforms it is expected to provide a separation between
SoC and boards files in 'Silicon' and 'Platform' directories
accordingly.

This patch aligns Marvell code to this requirement with no functional
changes in the actual source files, unless required due to modified
paths. Change the supported board's files names to proper Armada70x0Db.

Also rename 'Armada' directory to 'Armada7k8k' in order to properly
refer to the SoC family and prevent confusion in future, when
adding new Armada machines. On the occasion add ARM copyright,
which was wrongly missing in the dsc.inc file.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

88 files changed, 58 insertions, 56 deletions

diff --git a/Platform/Marvell/Armada/Armada70x0.dsc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
index 8e4cdb2763..46a1ea94f7 100644
--- a/Platform/Marvell/Armada/Armada70x0.dsc
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
@@ -35,7 +35,7 @@
 #

 ################################################################################

 [Defines]

-  PLATFORM_NAME                  = Armada70x0

+  PLATFORM_NAME                  = Armada70x0Db

   PLATFORM_GUID                  = f837e231-cfc7-4f56-9a0f-5b218d746ae3

   PLATFORM_VERSION               = 0.1

   DSC_SPECIFICATION              = 0x00010005

@@ -43,9 +43,9 @@
   SUPPORTED_ARCHITECTURES        = AARCH64|ARM

   BUILD_TARGETS                  = DEBUG|RELEASE

   SKUID_IDENTIFIER               = DEFAULT

-  FLASH_DEFINITION               = Platform/Marvell/Armada/Armada70x0.fdf

+  FLASH_DEFINITION               = Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf

 

-!include Armada.dsc.inc

+!include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc

 

 ################################################################################

 #

diff --git a/Platform/Marvell/Armada/Armada70x0.fdf b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
index c03bc4287f..f63f42d89f 100644
--- a/Platform/Marvell/Armada/Armada70x0.fdf
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
@@ -92,7 +92,7 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
   #

   # Platform Initialization

   #

-  INF Platform/Marvell/Armada/Drivers/PlatInitDxe/PlatInitDxe.inf

+  INF Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf

 

   # PI DXE Drivers producing Architectural Protocols (EFI Services)

   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf

@@ -107,15 +107,15 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
   INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf

   INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf

   INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

-  INF Platform/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf

+  INF Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf

   INF MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf

-  INF Platform/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf

-  INF Platform/Marvell/Drivers/Spi/MvSpiDxe.inf

-  INF Platform/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf

-  INF Platform/Marvell/Armada/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf

+  INF Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf

+  INF Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf

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

+  INF Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf

 

   # Variable services

-  INF Platform/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf

+  INF Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf

   INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf

 

@@ -131,12 +131,12 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
   INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

   INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

   INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

-  INF Platform/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf

-  INF Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf

-  INF Platform/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf

+  INF Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf

+  INF Silicon/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf

+  INF Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf

 

   # PciEmulation

-  INF Platform/Marvell/PciEmulation/PciEmulation.inf

+  INF Silicon/Marvell/PciEmulation/PciEmulation.inf

   INF MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf

 

   # SCSI

@@ -156,7 +156,7 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
   # SD/MMC

   INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf

   INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf

-  INF Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.inf

+  INF Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.inf

 

   # Multiple Console IO support

   INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

diff --git a/Platform/Marvell/Applications/EepromCmd/EepromCmd.c b/Silicon/Marvell/Applications/EepromCmd/EepromCmd.c
index f43e411067..f43e411067 100644
--- a/Platform/Marvell/Applications/EepromCmd/EepromCmd.c
+++ b/Silicon/Marvell/Applications/EepromCmd/EepromCmd.c
diff --git a/Platform/Marvell/Applications/EepromCmd/EepromCmd.inf b/Silicon/Marvell/Applications/EepromCmd/EepromCmd.inf
index 984e60f155..c86ead1b7d 100644
--- a/Platform/Marvell/Applications/EepromCmd/EepromCmd.inf
+++ b/Silicon/Marvell/Applications/EepromCmd/EepromCmd.inf
@@ -48,7 +48,7 @@
   ShellPkg/ShellPkg.dec

   StdLib/StdLib.dec

   MdeModulePkg/MdeModulePkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   UefiLib

diff --git a/Platform/Marvell/Applications/EepromCmd/EepromCmd.uni b/Silicon/Marvell/Applications/EepromCmd/EepromCmd.uni
index e41c6d812e..e41c6d812e 100644
--- a/Platform/Marvell/Applications/EepromCmd/EepromCmd.uni
+++ b/Silicon/Marvell/Applications/EepromCmd/EepromCmd.uni
diff --git a/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.c b/Silicon/Marvell/Applications/FirmwareUpdate/FUpdate.c
index 9ccb1c749b..9ccb1c749b 100644
--- a/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.c
+++ b/Silicon/Marvell/Applications/FirmwareUpdate/FUpdate.c
diff --git a/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.inf b/Silicon/Marvell/Applications/FirmwareUpdate/FUpdate.inf
index 53ea4916d6..69ee0f8308 100644
--- a/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.inf
+++ b/Silicon/Marvell/Applications/FirmwareUpdate/FUpdate.inf
@@ -47,7 +47,7 @@
   EmbeddedPkg/EmbeddedPkg.dec

   MdeModulePkg/MdeModulePkg.dec

   MdePkg/MdePkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

   ShellPkg/ShellPkg.dec

 

 [LibraryClasses]

diff --git a/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni b/Silicon/Marvell/Applications/FirmwareUpdate/FUpdate.uni
index 146f624737..146f624737 100644
--- a/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni
+++ b/Silicon/Marvell/Applications/FirmwareUpdate/FUpdate.uni
diff --git a/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c b/Silicon/Marvell/Applications/SpiTool/SpiFlashCmd.c
index cf91581dcf..cf91581dcf 100644
--- a/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c
+++ b/Silicon/Marvell/Applications/SpiTool/SpiFlashCmd.c
diff --git a/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.inf b/Silicon/Marvell/Applications/SpiTool/SpiFlashCmd.inf
index a52906bd23..647ab506b3 100644
--- a/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.inf
+++ b/Silicon/Marvell/Applications/SpiTool/SpiFlashCmd.inf
@@ -48,7 +48,7 @@
  MdePkg/MdePkg.dec

  ShellPkg/ShellPkg.dec

  MdeModulePkg/MdeModulePkg.dec

- Platform/Marvell/Marvell.dec

+ Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

  UefiLib

diff --git a/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.uni b/Silicon/Marvell/Applications/SpiTool/SpiFlashCmd.uni
index 3f25663ed7..3f25663ed7 100644
--- a/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.uni
+++ b/Silicon/Marvell/Applications/SpiTool/SpiFlashCmd.uni
diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 4b29691e96..75717e915b 100644
--- a/Platform/Marvell/Armada/Armada.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -1,3 +1,5 @@
+#

+#Copyright (c) 2011-2012, ARM Limited. All rights reserved.

 #Copyright (C) 2016 Marvell International Ltd.

 #

 #Marvell BSD License Option

@@ -30,11 +32,11 @@
 #SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #

 [LibraryClasses.common]

-  ArmPlatformLib|Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf

-  ComPhyLib|Platform/Marvell/Library/ComPhyLib/ComPhyLib.inf

-  MppLib|Platform/Marvell/Library/MppLib/MppLib.inf

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

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

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

   NorFlashInfoLib|EmbeddedPkg/Library/NorFlashInfoLib/NorFlashInfoLib.inf

-  UtmiPhyLib|Platform/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf

+  UtmiPhyLib|Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf

 

   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

@@ -91,7 +93,7 @@
 

   # Reset and Time libraries

   TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf

-  RealTimeClockLib|Platform/Marvell/Armada/Library/RealTimeClockLib/RealTimeClockLib.inf

+  RealTimeClockLib|Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf

   ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf

 

   # Network support

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

 

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

-  MemoryInitPeiLib|Platform/Marvell/Armada/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf

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

   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

 

 [LibraryClasses.common.DXE_CORE]

@@ -403,15 +405,15 @@
   ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.inf

 

   # Platform Initialization

-  Platform/Marvell/Armada/Drivers/PlatInitDxe/PlatInitDxe.inf

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

 

   # Platform drivers

-  Platform/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf

+  Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf

   MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf

-  Platform/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf

-  Platform/Marvell/Drivers/Spi/MvSpiDxe.inf

-  Platform/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf

-  Platform/Marvell/Armada/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf

+  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

 

   # Network support

   MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf

@@ -425,9 +427,9 @@
   MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

   MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

   MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

-  Platform/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf

-  Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf

-  Platform/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf

+  Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf

+  Silicon/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf

+  Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf

 

   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf

   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

@@ -439,7 +441,7 @@
   EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

 

   # PciEmulation

-  Platform/Marvell/PciEmulation/PciEmulation.inf

+  Silicon/Marvell/PciEmulation/PciEmulation.inf

   MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf

 

   # SCSI

@@ -459,7 +461,7 @@
   # SD/MMC

   MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf

   MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf

-  Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.inf

+  Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.inf

 

   # Console packages

   MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

@@ -491,7 +493,7 @@
   #

   # Variable services

   #

-  Platform/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf

+  Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf

   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

   MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {

     <LibraryClasses>

@@ -512,9 +514,9 @@
       NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf

       NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf

       NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf

-      NULL|Platform/Marvell/Applications/EepromCmd/EepromCmd.inf

-      NULL|Platform/Marvell/Applications/SpiTool/SpiFlashCmd.inf

-      NULL|Platform/Marvell/Applications/FirmwareUpdate/FUpdate.inf

+      NULL|Silicon/Marvell/Applications/EepromCmd/EepromCmd.inf

+      NULL|Silicon/Marvell/Applications/SpiTool/SpiFlashCmd.inf

+      NULL|Silicon/Marvell/Applications/FirmwareUpdate/FUpdate.inf

       HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf

       PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

       BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf

diff --git a/Platform/Marvell/Armada/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.c b/Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.c
index 014443d130..014443d130 100644
--- a/Platform/Marvell/Armada/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.c
+++ b/Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.c
diff --git a/Platform/Marvell/Armada/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf b/Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf
index 189ffc5344..3d74c8e965 100644
--- a/Platform/Marvell/Armada/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf
+++ b/Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf
@@ -26,7 +26,7 @@
 

 [Packages]

   MdePkg/MdePkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   BaseMemoryLib

diff --git a/Platform/Marvell/Armada/Drivers/PlatInitDxe/PlatInitDxe.c b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c
index 1efad77854..1efad77854 100644
--- a/Platform/Marvell/Armada/Drivers/PlatInitDxe/PlatInitDxe.c
+++ b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c
diff --git a/Platform/Marvell/Armada/Drivers/PlatInitDxe/PlatInitDxe.inf b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf
index 790b7e3e4e..803dc6ede6 100644
--- a/Platform/Marvell/Armada/Drivers/PlatInitDxe/PlatInitDxe.inf
+++ b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf
@@ -27,7 +27,7 @@
 [Packages]

   MdeModulePkg/MdeModulePkg.dec

   MdePkg/MdePkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   ComPhyLib

diff --git a/Platform/Marvell/Armada/Library/Armada70x0Lib/AArch64/ArmPlatformHelper.S b/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/AArch64/ArmPlatformHelper.S
index 72f8cfce77..72f8cfce77 100644
--- a/Platform/Marvell/Armada/Library/Armada70x0Lib/AArch64/ArmPlatformHelper.S
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/AArch64/ArmPlatformHelper.S
diff --git a/Platform/Marvell/Armada/Library/Armada70x0Lib/ARM/ArmPlatformHelper.S b/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/ARM/ArmPlatformHelper.S
index 21459e50a7..21459e50a7 100644
--- a/Platform/Marvell/Armada/Library/Armada70x0Lib/ARM/ArmPlatformHelper.S
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/ARM/ArmPlatformHelper.S
diff --git a/Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.c b/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.c
index b2b415571c..b2b415571c 100644
--- a/Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.c
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.c
diff --git a/Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf b/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.inf
index 71abdd4517..4d4edc8565 100644
--- a/Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.inf
@@ -43,7 +43,7 @@
   MdeModulePkg/MdeModulePkg.dec

   ArmPkg/ArmPkg.dec

   ArmPlatformPkg/ArmPlatformPkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   ArmLib

diff --git a/Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0LibMem.c b/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0LibMem.c
index f384415d7a..f384415d7a 100644
--- a/Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0LibMem.c
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0LibMem.c
diff --git a/Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0LibMem.h b/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0LibMem.h
index cc30e4aeed..cc30e4aeed 100644
--- a/Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0LibMem.h
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0LibMem.h
diff --git a/Platform/Marvell/Armada/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.c b/Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.c
index 53119f4150..53119f4150 100644
--- a/Platform/Marvell/Armada/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.c
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.c
diff --git a/Platform/Marvell/Armada/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf b/Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf
index ebaed01689..adc5b9ac8d 100644
--- a/Platform/Marvell/Armada/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf
@@ -30,7 +30,7 @@
   EmbeddedPkg/EmbeddedPkg.dec

   MdeModulePkg/MdeModulePkg.dec

   MdePkg/MdePkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   ArmPlatformLib

diff --git a/Platform/Marvell/Armada/Library/RealTimeClockLib/RealTimeClockLib.c b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c
index d671b6adc1..d671b6adc1 100644
--- a/Platform/Marvell/Armada/Library/RealTimeClockLib/RealTimeClockLib.c
+++ b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c
diff --git a/Platform/Marvell/Armada/Library/RealTimeClockLib/RealTimeClockLib.h b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.h
index 922f959239..922f959239 100644
--- a/Platform/Marvell/Armada/Library/RealTimeClockLib/RealTimeClockLib.h
+++ b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.h
diff --git a/Platform/Marvell/Armada/Library/RealTimeClockLib/RealTimeClockLib.inf b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
index 01c25f53b7..2f842e8abf 100644
--- a/Platform/Marvell/Armada/Library/RealTimeClockLib/RealTimeClockLib.inf
+++ b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
@@ -34,7 +34,7 @@
   EmbeddedPkg/EmbeddedPkg.dec

   MdeModulePkg/MdeModulePkg.dec

   MdePkg/MdePkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   DebugLib

diff --git a/Platform/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.c b/Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.c
index d8fd1bfe62..d8fd1bfe62 100644
--- a/Platform/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.c
+++ b/Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.c
diff --git a/Platform/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.h b/Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.h
index b1af645050..b1af645050 100644
--- a/Platform/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.h
+++ b/Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.h
diff --git a/Platform/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf b/Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf
index a50f8b9b4e..510b5502dc 100644
--- a/Platform/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf
+++ b/Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf
@@ -45,7 +45,7 @@
   MdeModulePkg/MdeModulePkg.dec

   ArmPlatformPkg/ArmPlatformPkg.dec

   ArmPkg/ArmPkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   IoLib

diff --git a/Platform/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.c b/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.c
index d6f590d5bf..d6f590d5bf 100755
--- a/Platform/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.c
+++ b/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.c
diff --git a/Platform/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.h b/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.h
index 3c9beaf967..3c9beaf967 100644
--- a/Platform/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.h
+++ b/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.h
diff --git a/Platform/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf b/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf
index 80655f13fe..a7cf52e7e1 100755
--- a/Platform/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf
+++ b/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf
@@ -45,7 +45,7 @@
   MdeModulePkg/MdeModulePkg.dec

   ArmPlatformPkg/ArmPlatformPkg.dec

   ArmPkg/ArmPkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   IoLib

diff --git a/Platform/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.c b/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.c
index 12aabad0f3..12aabad0f3 100644
--- a/Platform/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.c
+++ b/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.c
diff --git a/Platform/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.h b/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.h
index b41a1e6fba..b41a1e6fba 100644
--- a/Platform/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.h
+++ b/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.h
diff --git a/Platform/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf b/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
index d9878eb31a..c070785e6e 100644
--- a/Platform/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
+++ b/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
@@ -47,7 +47,7 @@
   ArmPlatformPkg/ArmPlatformPkg.dec

   MdeModulePkg/MdeModulePkg.dec

   MdePkg/MdePkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   BaseLib

diff --git a/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c b/Silicon/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c
index dd2edaec36..dd2edaec36 100644
--- a/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c
+++ b/Silicon/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c
diff --git a/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h b/Silicon/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h
index 66974bba4b..66974bba4b 100644
--- a/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h
+++ b/Silicon/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h
diff --git a/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf b/Silicon/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf
index 2abd673ebe..fe0f55478b 100644
--- a/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf
+++ b/Silicon/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf
@@ -46,7 +46,7 @@
   ArmPlatformPkg/ArmPlatformPkg.dec

   MdeModulePkg/MdeModulePkg.dec

   MdePkg/MdePkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   BaseLib

diff --git a/Platform/Marvell/Drivers/Net/Pp2Dxe/Mvpp2Lib.c b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Mvpp2Lib.c
index 0c9f00c04a..0c9f00c04a 100644
--- a/Platform/Marvell/Drivers/Net/Pp2Dxe/Mvpp2Lib.c
+++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Mvpp2Lib.c
diff --git a/Platform/Marvell/Drivers/Net/Pp2Dxe/Mvpp2Lib.h b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Mvpp2Lib.h
index 3dc9ecdd20..3dc9ecdd20 100644
--- a/Platform/Marvell/Drivers/Net/Pp2Dxe/Mvpp2Lib.h
+++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Mvpp2Lib.h
diff --git a/Platform/Marvell/Drivers/Net/Pp2Dxe/Mvpp2LibHw.h b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Mvpp2LibHw.h
index 0ebf9367bb..0ebf9367bb 100644
--- a/Platform/Marvell/Drivers/Net/Pp2Dxe/Mvpp2LibHw.h
+++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Mvpp2LibHw.h
diff --git a/Platform/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c
index b0a38b3c90..b0a38b3c90 100644
--- a/Platform/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c
+++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c
diff --git a/Platform/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h
index 60f40be1f5..60f40be1f5 100644
--- a/Platform/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h
+++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h
diff --git a/Platform/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
index b4568d89a9..fcd0611b4d 100644
--- a/Platform/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
+++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
@@ -47,7 +47,7 @@
   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

   ArmPkg/ArmPkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   DmaLib

diff --git a/Platform/Marvell/Drivers/SdMmc/XenonDxe/ComponentName.c b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/ComponentName.c
index 3329929119..3329929119 100644
--- a/Platform/Marvell/Drivers/SdMmc/XenonDxe/ComponentName.c
+++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/ComponentName.c
diff --git a/Platform/Marvell/Drivers/SdMmc/XenonDxe/EmmcDevice.c b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/EmmcDevice.c
index 530a01ccdc..530a01ccdc 100755
--- a/Platform/Marvell/Drivers/SdMmc/XenonDxe/EmmcDevice.c
+++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/EmmcDevice.c
diff --git a/Platform/Marvell/Drivers/SdMmc/XenonDxe/SdDevice.c b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdDevice.c
index ea7eed717f..ea7eed717f 100644
--- a/Platform/Marvell/Drivers/SdMmc/XenonDxe/SdDevice.c
+++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdDevice.c
diff --git a/Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.c b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.c
index 80159a4f5d..80159a4f5d 100644
--- a/Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.c
+++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.c
diff --git a/Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.h b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.h
index 067b9acf61..067b9acf61 100644
--- a/Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.h
+++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.h
diff --git a/Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.inf b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.inf
index fad9fc610e..fad9fc610e 100644
--- a/Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.inf
+++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.inf
diff --git a/Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.uni b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.uni
index 57f9fa76a1..57f9fa76a1 100644
--- a/Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.uni
+++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.uni
diff --git a/Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxeExtra.uni b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxeExtra.uni
index c7aedb4cda..c7aedb4cda 100644
--- a/Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxeExtra.uni
+++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxeExtra.uni
diff --git a/Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHci.c b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHci.c
index 1f4abd18a6..1f4abd18a6 100644
--- a/Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHci.c
+++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHci.c
diff --git a/Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHci.h b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHci.h
index 533f37c79f..533f37c79f 100644
--- a/Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHci.h
+++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHci.h
diff --git a/Platform/Marvell/Drivers/SdMmc/XenonDxe/XenonSdhci.c b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonSdhci.c
index 6bbe5bc675..6bbe5bc675 100755
--- a/Platform/Marvell/Drivers/SdMmc/XenonDxe/XenonSdhci.c
+++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonSdhci.c
diff --git a/Platform/Marvell/Drivers/SdMmc/XenonDxe/XenonSdhci.h b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonSdhci.h
index 2be0ee61e1..2be0ee61e1 100644
--- a/Platform/Marvell/Drivers/SdMmc/XenonDxe/XenonSdhci.h
+++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonSdhci.h
diff --git a/Platform/Marvell/Drivers/Spi/Devices/MvSpiFlash.c b/Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.c
index 6886d0104a..6886d0104a 100755
--- a/Platform/Marvell/Drivers/Spi/Devices/MvSpiFlash.c
+++ b/Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.c
diff --git a/Platform/Marvell/Drivers/Spi/Devices/MvSpiFlash.h b/Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.h
index f69c562190..f69c562190 100755
--- a/Platform/Marvell/Drivers/Spi/Devices/MvSpiFlash.h
+++ b/Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.h
diff --git a/Platform/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf b/Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf
index c6bbe5e8ab..bc88a7ea98 100644
--- a/Platform/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf
+++ b/Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf
@@ -44,7 +44,7 @@
 [Packages]

   EmbeddedPkg/EmbeddedPkg.dec

   MdePkg/MdePkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   NorFlashInfoLib

diff --git a/Platform/Marvell/Drivers/Spi/MvSpiDxe.c b/Silicon/Marvell/Drivers/Spi/MvSpiDxe.c
index bab6cf4d56..bab6cf4d56 100755
--- a/Platform/Marvell/Drivers/Spi/MvSpiDxe.c
+++ b/Silicon/Marvell/Drivers/Spi/MvSpiDxe.c
diff --git a/Platform/Marvell/Drivers/Spi/MvSpiDxe.h b/Silicon/Marvell/Drivers/Spi/MvSpiDxe.h
index 50cdc025c7..50cdc025c7 100644
--- a/Platform/Marvell/Drivers/Spi/MvSpiDxe.h
+++ b/Silicon/Marvell/Drivers/Spi/MvSpiDxe.h
diff --git a/Platform/Marvell/Drivers/Spi/MvSpiDxe.inf b/Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
index ac0e407092..e7bc170e64 100644
--- a/Platform/Marvell/Drivers/Spi/MvSpiDxe.inf
+++ b/Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
@@ -44,7 +44,7 @@
 [Packages]

   EmbeddedPkg/EmbeddedPkg.dec

   MdePkg/MdePkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   NorFlashInfoLib

diff --git a/Platform/Marvell/Drivers/Spi/Variables/MvFvbDxe.c b/Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.c
index 252ef67566..252ef67566 100644
--- a/Platform/Marvell/Drivers/Spi/Variables/MvFvbDxe.c
+++ b/Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.c
diff --git a/Platform/Marvell/Drivers/Spi/Variables/MvFvbDxe.h b/Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.h
index 31e6e444be..31e6e444be 100644
--- a/Platform/Marvell/Drivers/Spi/Variables/MvFvbDxe.h
+++ b/Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.h
diff --git a/Platform/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf b/Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf
index 5d73c2165c..117fe8bdd6 100644
--- a/Platform/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf
+++ b/Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf
@@ -45,7 +45,7 @@
   EmbeddedPkg/EmbeddedPkg.dec

   MdeModulePkg/MdeModulePkg.dec

   MdePkg/MdePkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   BaseLib

diff --git a/Platform/Marvell/Include/Library/MppLib.h b/Silicon/Marvell/Include/Library/MppLib.h
index 77c6cdb1c4..77c6cdb1c4 100644
--- a/Platform/Marvell/Include/Library/MppLib.h
+++ b/Silicon/Marvell/Include/Library/MppLib.h
diff --git a/Platform/Marvell/Include/Library/MvComPhyLib.h b/Silicon/Marvell/Include/Library/MvComPhyLib.h
index 6076ede613..6076ede613 100644
--- a/Platform/Marvell/Include/Library/MvComPhyLib.h
+++ b/Silicon/Marvell/Include/Library/MvComPhyLib.h
diff --git a/Platform/Marvell/Include/Library/MvHwDescLib.h b/Silicon/Marvell/Include/Library/MvHwDescLib.h
index 9ae03d0bbd..9ae03d0bbd 100644
--- a/Platform/Marvell/Include/Library/MvHwDescLib.h
+++ b/Silicon/Marvell/Include/Library/MvHwDescLib.h
diff --git a/Platform/Marvell/Include/Library/UtmiPhyLib.h b/Silicon/Marvell/Include/Library/UtmiPhyLib.h
index 7c62cbab20..7c62cbab20 100644
--- a/Platform/Marvell/Include/Library/UtmiPhyLib.h
+++ b/Silicon/Marvell/Include/Library/UtmiPhyLib.h
diff --git a/Platform/Marvell/Include/Protocol/Eeprom.h b/Silicon/Marvell/Include/Protocol/Eeprom.h
index fbe4282b91..fbe4282b91 100644
--- a/Platform/Marvell/Include/Protocol/Eeprom.h
+++ b/Silicon/Marvell/Include/Protocol/Eeprom.h
diff --git a/Platform/Marvell/Include/Protocol/Mdio.h b/Silicon/Marvell/Include/Protocol/Mdio.h
index d077a8f74f..d077a8f74f 100644
--- a/Platform/Marvell/Include/Protocol/Mdio.h
+++ b/Silicon/Marvell/Include/Protocol/Mdio.h
diff --git a/Platform/Marvell/Include/Protocol/MvPhy.h b/Silicon/Marvell/Include/Protocol/MvPhy.h
index 99c75b36a8..99c75b36a8 100644
--- a/Platform/Marvell/Include/Protocol/MvPhy.h
+++ b/Silicon/Marvell/Include/Protocol/MvPhy.h
diff --git a/Platform/Marvell/Include/Protocol/Spi.h b/Silicon/Marvell/Include/Protocol/Spi.h
index abbad19749..abbad19749 100644
--- a/Platform/Marvell/Include/Protocol/Spi.h
+++ b/Silicon/Marvell/Include/Protocol/Spi.h
diff --git a/Platform/Marvell/Include/Protocol/SpiFlash.h b/Silicon/Marvell/Include/Protocol/SpiFlash.h
index 4ba29ba769..4ba29ba769 100644
--- a/Platform/Marvell/Include/Protocol/SpiFlash.h
+++ b/Silicon/Marvell/Include/Protocol/SpiFlash.h
diff --git a/Platform/Marvell/Library/ComPhyLib/ComPhyCp110.c b/Silicon/Marvell/Library/ComPhyLib/ComPhyCp110.c
index 40a7b9921c..40a7b9921c 100755
--- a/Platform/Marvell/Library/ComPhyLib/ComPhyCp110.c
+++ b/Silicon/Marvell/Library/ComPhyLib/ComPhyCp110.c
diff --git a/Platform/Marvell/Library/ComPhyLib/ComPhyLib.c b/Silicon/Marvell/Library/ComPhyLib/ComPhyLib.c
index bf21dca3fb..bf21dca3fb 100644
--- a/Platform/Marvell/Library/ComPhyLib/ComPhyLib.c
+++ b/Silicon/Marvell/Library/ComPhyLib/ComPhyLib.c
diff --git a/Platform/Marvell/Library/ComPhyLib/ComPhyLib.h b/Silicon/Marvell/Library/ComPhyLib/ComPhyLib.h
index 5899a4ac25..5899a4ac25 100644
--- a/Platform/Marvell/Library/ComPhyLib/ComPhyLib.h
+++ b/Silicon/Marvell/Library/ComPhyLib/ComPhyLib.h
diff --git a/Platform/Marvell/Library/ComPhyLib/ComPhyLib.inf b/Silicon/Marvell/Library/ComPhyLib/ComPhyLib.inf
index c223fe5d04..a1584b4cfc 100644
--- a/Platform/Marvell/Library/ComPhyLib/ComPhyLib.inf
+++ b/Silicon/Marvell/Library/ComPhyLib/ComPhyLib.inf
@@ -43,7 +43,7 @@
   MdeModulePkg/MdeModulePkg.dec

   ArmPkg/ArmPkg.dec

   ArmPlatformPkg/ArmPlatformPkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   ArmLib

diff --git a/Platform/Marvell/Library/ComPhyLib/ComPhyMux.c b/Silicon/Marvell/Library/ComPhyLib/ComPhyMux.c
index 6589fec9f0..6589fec9f0 100644
--- a/Platform/Marvell/Library/ComPhyLib/ComPhyMux.c
+++ b/Silicon/Marvell/Library/ComPhyLib/ComPhyMux.c
diff --git a/Platform/Marvell/Library/MppLib/MppLib.c b/Silicon/Marvell/Library/MppLib/MppLib.c
index 297725f6af..297725f6af 100644
--- a/Platform/Marvell/Library/MppLib/MppLib.c
+++ b/Silicon/Marvell/Library/MppLib/MppLib.c
diff --git a/Platform/Marvell/Library/MppLib/MppLib.inf b/Silicon/Marvell/Library/MppLib/MppLib.inf
index 12685428a3..9d7e9f0914 100644
--- a/Platform/Marvell/Library/MppLib/MppLib.inf
+++ b/Silicon/Marvell/Library/MppLib/MppLib.inf
@@ -42,7 +42,7 @@
   MdeModulePkg/MdeModulePkg.dec

   ArmPkg/ArmPkg.dec

   ArmPlatformPkg/ArmPlatformPkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   ArmLib

diff --git a/Platform/Marvell/Library/UtmiPhyLib/UtmiPhyLib.c b/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.c
index 2cd9cfa88f..2cd9cfa88f 100644
--- a/Platform/Marvell/Library/UtmiPhyLib/UtmiPhyLib.c
+++ b/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.c
diff --git a/Platform/Marvell/Library/UtmiPhyLib/UtmiPhyLib.h b/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.h
index 0d7d72e72b..0d7d72e72b 100644
--- a/Platform/Marvell/Library/UtmiPhyLib/UtmiPhyLib.h
+++ b/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.h
diff --git a/Platform/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf b/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf
index b56c43b36e..0876879e7d 100644
--- a/Platform/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf
+++ b/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf
@@ -43,7 +43,7 @@
   ArmPlatformPkg/ArmPlatformPkg.dec

   MdeModulePkg/MdeModulePkg.dec

   MdePkg/MdePkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   ArmLib

diff --git a/Platform/Marvell/Marvell.dec b/Silicon/Marvell/Marvell.dec
index 2eb62388a1..2eb62388a1 100644
--- a/Platform/Marvell/Marvell.dec
+++ b/Silicon/Marvell/Marvell.dec
diff --git a/Platform/Marvell/PciEmulation/PciEmulation.c b/Silicon/Marvell/PciEmulation/PciEmulation.c
index 35f1a87d81..35f1a87d81 100644
--- a/Platform/Marvell/PciEmulation/PciEmulation.c
+++ b/Silicon/Marvell/PciEmulation/PciEmulation.c
diff --git a/Platform/Marvell/PciEmulation/PciEmulation.inf b/Silicon/Marvell/PciEmulation/PciEmulation.inf
index 45490ebe4c..c6a3c99827 100644
--- a/Platform/Marvell/PciEmulation/PciEmulation.inf
+++ b/Silicon/Marvell/PciEmulation/PciEmulation.inf
@@ -46,7 +46,7 @@
   EmbeddedPkg/EmbeddedPkg.dec

   MdeModulePkg/MdeModulePkg.dec

   MdePkg/MdePkg.dec

-  Platform/Marvell/Marvell.dec

+  Silicon/Marvell/Marvell.dec

 

 [LibraryClasses]

   NonDiscoverableDeviceRegistrationLib