public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Marcin Wojtas <mw@semihalf.com>
To: edk2-devel@lists.01.org
Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org,
	nadavh@marvell.com, neta@marvell.com, kostap@marvell.com,
	jinghua@marvell.com, mw@semihalf.com, jsd@semihalf.com,
	ka@semihalf.com
Subject: [platforms: PATCH v2 1/5] Marvell: Reorganize file structure
Date: Thu,  7 Dec 2017 20:20:30 +0100	[thread overview]
Message-ID: <1512674434-32326-2-git-send-email-mw@semihalf.com> (raw)
In-Reply-To: <1512674434-32326-1-git-send-email-mw@semihalf.com>

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>
---
 Platform/Marvell/{Armada/Armada70x0.dsc => Armada70x0Db/Armada70x0Db.dsc}                                                 |   6 +--
 Platform/Marvell/{Armada/Armada70x0.fdf => Armada70x0Db/Armada70x0Db.fdf}                                                 |  24 +++++------
 {Platform => Silicon}/Marvell/Applications/EepromCmd/EepromCmd.c                                                          |   0
 {Platform => Silicon}/Marvell/Applications/EepromCmd/EepromCmd.inf                                                        |   2 +-
 {Platform => Silicon}/Marvell/Applications/EepromCmd/EepromCmd.uni                                                        | Bin
 {Platform => Silicon}/Marvell/Applications/FirmwareUpdate/FUpdate.c                                                       |   0
 {Platform => Silicon}/Marvell/Applications/FirmwareUpdate/FUpdate.inf                                                     |   2 +-
 {Platform => Silicon}/Marvell/Applications/FirmwareUpdate/FUpdate.uni                                                     | Bin
 {Platform => Silicon}/Marvell/Applications/SpiTool/SpiFlashCmd.c                                                          |   0
 {Platform => Silicon}/Marvell/Applications/SpiTool/SpiFlashCmd.inf                                                        |   2 +-
 {Platform => Silicon}/Marvell/Applications/SpiTool/SpiFlashCmd.uni                                                        | Bin
 Platform/Marvell/Armada/Armada.dsc.inc => Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc                                   |  44 ++++++++++----------
 {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.c                       |   0
 {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf                     |   2 +-
 {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Drivers/PlatInitDxe/PlatInitDxe.c                                 |   0
 {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Drivers/PlatInitDxe/PlatInitDxe.inf                               |   2 +-
 {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/Armada70x0Lib/AArch64/ArmPlatformHelper.S                 |   0
 {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/Armada70x0Lib/ARM/ArmPlatformHelper.S                     |   0
 {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/Armada70x0Lib/Armada70x0Lib.c                             |   0
 {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/Armada70x0Lib/Armada70x0Lib.inf                           |   2 +-
 {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/Armada70x0Lib/Armada70x0LibMem.c                          |   0
 {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/Armada70x0Lib/Armada70x0LibMem.h                          |   0
 {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.c   |   0
 {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf |   2 +-
 {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/RealTimeClockLib/RealTimeClockLib.c                       |   0
 {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/RealTimeClockLib/RealTimeClockLib.h                       |   0
 {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/RealTimeClockLib/RealTimeClockLib.inf                     |   2 +-
 {Platform => Silicon}/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.c                                                     |   0
 {Platform => Silicon}/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.h                                                     |   0
 {Platform => Silicon}/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf                                                   |   2 +-
 {Platform => Silicon}/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.c                                                             |   0
 {Platform => Silicon}/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.h                                                             |   0
 {Platform => Silicon}/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf                                                           |   2 +-
 {Platform => Silicon}/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.c                                                           |   0
 {Platform => Silicon}/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.h                                                           |   0
 {Platform => Silicon}/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf                                                         |   2 +-
 {Platform => Silicon}/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c                                                         |   0
 {Platform => Silicon}/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h                                                         |   0
 {Platform => Silicon}/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf                                                       |   2 +-
 {Platform => Silicon}/Marvell/Drivers/Net/Pp2Dxe/Mvpp2Lib.c                                                               |   0
 {Platform => Silicon}/Marvell/Drivers/Net/Pp2Dxe/Mvpp2Lib.h                                                               |   0
 {Platform => Silicon}/Marvell/Drivers/Net/Pp2Dxe/Mvpp2LibHw.h                                                             |   0
 {Platform => Silicon}/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c                                                                 |   0
 {Platform => Silicon}/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h                                                                 |   0
 {Platform => Silicon}/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf                                                               |   2 +-
 {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/ComponentName.c                                                      |   0
 {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/EmmcDevice.c                                                         |   0
 {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/SdDevice.c                                                           |   0
 {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.c                                                      |   0
 {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.h                                                      |   0
 {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.inf                                                    |   0
 {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.uni                                                    |   0
 {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxeExtra.uni                                               |   0
 {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHci.c                                                        |   0
 {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHci.h                                                        |   0
 {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/XenonSdhci.c                                                         |   0
 {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/XenonSdhci.h                                                         |   0
 {Platform => Silicon}/Marvell/Drivers/Spi/Devices/MvSpiFlash.c                                                            |   0
 {Platform => Silicon}/Marvell/Drivers/Spi/Devices/MvSpiFlash.h                                                            |   0
 {Platform => Silicon}/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf                                                          |   2 +-
 {Platform => Silicon}/Marvell/Drivers/Spi/MvSpiDxe.c                                                                      |   0
 {Platform => Silicon}/Marvell/Drivers/Spi/MvSpiDxe.h                                                                      |   0
 {Platform => Silicon}/Marvell/Drivers/Spi/MvSpiDxe.inf                                                                    |   2 +-
 {Platform => Silicon}/Marvell/Drivers/Spi/Variables/MvFvbDxe.c                                                            |   0
 {Platform => Silicon}/Marvell/Drivers/Spi/Variables/MvFvbDxe.h                                                            |   0
 {Platform => Silicon}/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf                                                          |   2 +-
 {Platform => Silicon}/Marvell/Include/Library/MppLib.h                                                                    |   0
 {Platform => Silicon}/Marvell/Include/Library/MvComPhyLib.h                                                               |   0
 {Platform => Silicon}/Marvell/Include/Library/MvHwDescLib.h                                                               |   0
 {Platform => Silicon}/Marvell/Include/Library/UtmiPhyLib.h                                                                |   0
 {Platform => Silicon}/Marvell/Include/Protocol/Eeprom.h                                                                   |   0
 {Platform => Silicon}/Marvell/Include/Protocol/Mdio.h                                                                     |   0
 {Platform => Silicon}/Marvell/Include/Protocol/MvPhy.h                                                                    |   0
 {Platform => Silicon}/Marvell/Include/Protocol/Spi.h                                                                      |   0
 {Platform => Silicon}/Marvell/Include/Protocol/SpiFlash.h                                                                 |   0
 {Platform => Silicon}/Marvell/Library/ComPhyLib/ComPhyCp110.c                                                             |   0
 {Platform => Silicon}/Marvell/Library/ComPhyLib/ComPhyLib.c                                                               |   0
 {Platform => Silicon}/Marvell/Library/ComPhyLib/ComPhyLib.h                                                               |   0
 {Platform => Silicon}/Marvell/Library/ComPhyLib/ComPhyLib.inf                                                             |   2 +-
 {Platform => Silicon}/Marvell/Library/ComPhyLib/ComPhyMux.c                                                               |   0
 {Platform => Silicon}/Marvell/Library/MppLib/MppLib.c                                                                     |   0
 {Platform => Silicon}/Marvell/Library/MppLib/MppLib.inf                                                                   |   2 +-
 {Platform => Silicon}/Marvell/Library/UtmiPhyLib/UtmiPhyLib.c                                                             |   0
 {Platform => Silicon}/Marvell/Library/UtmiPhyLib/UtmiPhyLib.h                                                             |   0
 {Platform => Silicon}/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf                                                           |   2 +-
 {Platform => Silicon}/Marvell/Marvell.dec                                                                                 |   0
 {Platform => Silicon}/Marvell/PciEmulation/PciEmulation.c                                                                 |   0
 {Platform => Silicon}/Marvell/PciEmulation/PciEmulation.inf                                                               |   2 +-
 88 files changed, 58 insertions(+), 56 deletions(-)
 rename Platform/Marvell/{Armada/Armada70x0.dsc => Armada70x0Db/Armada70x0Db.dsc} (95%)
 rename Platform/Marvell/{Armada/Armada70x0.fdf => Armada70x0Db/Armada70x0Db.fdf} (91%)
 rename {Platform => Silicon}/Marvell/Applications/EepromCmd/EepromCmd.c (100%)
 rename {Platform => Silicon}/Marvell/Applications/EepromCmd/EepromCmd.inf (95%)
 rename {Platform => Silicon}/Marvell/Applications/EepromCmd/EepromCmd.uni (100%)
 rename {Platform => Silicon}/Marvell/Applications/FirmwareUpdate/FUpdate.c (100%)
 rename {Platform => Silicon}/Marvell/Applications/FirmwareUpdate/FUpdate.inf (95%)
 rename {Platform => Silicon}/Marvell/Applications/FirmwareUpdate/FUpdate.uni (100%)
 rename {Platform => Silicon}/Marvell/Applications/SpiTool/SpiFlashCmd.c (100%)
 rename {Platform => Silicon}/Marvell/Applications/SpiTool/SpiFlashCmd.inf (95%)
 rename {Platform => Silicon}/Marvell/Applications/SpiTool/SpiFlashCmd.uni (100%)
 rename Platform/Marvell/Armada/Armada.dsc.inc => Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc (93%)
 rename {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.c (100%)
 rename {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf (93%)
 rename {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Drivers/PlatInitDxe/PlatInitDxe.c (100%)
 rename {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Drivers/PlatInitDxe/PlatInitDxe.inf (93%)
 rename {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/Armada70x0Lib/AArch64/ArmPlatformHelper.S (100%)
 rename {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/Armada70x0Lib/ARM/ArmPlatformHelper.S (100%)
 rename {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/Armada70x0Lib/Armada70x0Lib.c (100%)
 rename {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/Armada70x0Lib/Armada70x0Lib.inf (96%)
 rename {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/Armada70x0Lib/Armada70x0LibMem.c (100%)
 rename {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/Armada70x0Lib/Armada70x0LibMem.h (100%)
 rename {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.c (100%)
 rename {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf (94%)
 rename {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/RealTimeClockLib/RealTimeClockLib.c (100%)
 rename {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/RealTimeClockLib/RealTimeClockLib.h (100%)
 rename {Platform/Marvell/Armada => Silicon/Marvell/Armada7k8k}/Library/RealTimeClockLib/RealTimeClockLib.inf (94%)
 rename {Platform => Silicon}/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.c (100%)
 rename {Platform => Silicon}/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.h (100%)
 rename {Platform => Silicon}/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf (96%)
 rename {Platform => Silicon}/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.c (100%)
 rename {Platform => Silicon}/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.h (100%)
 rename {Platform => Silicon}/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf (96%)
 rename {Platform => Silicon}/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.c (100%)
 rename {Platform => Silicon}/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.h (100%)
 rename {Platform => Silicon}/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf (96%)
 rename {Platform => Silicon}/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c (100%)
 rename {Platform => Silicon}/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h (100%)
 rename {Platform => Silicon}/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf (96%)
 rename {Platform => Silicon}/Marvell/Drivers/Net/Pp2Dxe/Mvpp2Lib.c (100%)
 rename {Platform => Silicon}/Marvell/Drivers/Net/Pp2Dxe/Mvpp2Lib.h (100%)
 rename {Platform => Silicon}/Marvell/Drivers/Net/Pp2Dxe/Mvpp2LibHw.h (100%)
 rename {Platform => Silicon}/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c (100%)
 rename {Platform => Silicon}/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h (100%)
 rename {Platform => Silicon}/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf (96%)
 rename {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/ComponentName.c (100%)
 rename {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/EmmcDevice.c (100%)
 rename {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/SdDevice.c (100%)
 rename {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.c (100%)
 rename {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.h (100%)
 rename {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.inf (100%)
 rename {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.uni (100%)
 rename {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxeExtra.uni (100%)
 rename {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHci.c (100%)
 rename {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHci.h (100%)
 rename {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/XenonSdhci.c (100%)
 rename {Platform => Silicon}/Marvell/Drivers/SdMmc/XenonDxe/XenonSdhci.h (100%)
 rename {Platform => Silicon}/Marvell/Drivers/Spi/Devices/MvSpiFlash.c (100%)
 rename {Platform => Silicon}/Marvell/Drivers/Spi/Devices/MvSpiFlash.h (100%)
 rename {Platform => Silicon}/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf (96%)
 rename {Platform => Silicon}/Marvell/Drivers/Spi/MvSpiDxe.c (100%)
 rename {Platform => Silicon}/Marvell/Drivers/Spi/MvSpiDxe.h (100%)
 rename {Platform => Silicon}/Marvell/Drivers/Spi/MvSpiDxe.inf (96%)
 rename {Platform => Silicon}/Marvell/Drivers/Spi/Variables/MvFvbDxe.c (100%)
 rename {Platform => Silicon}/Marvell/Drivers/Spi/Variables/MvFvbDxe.h (100%)
 rename {Platform => Silicon}/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf (96%)
 rename {Platform => Silicon}/Marvell/Include/Library/MppLib.h (100%)
 rename {Platform => Silicon}/Marvell/Include/Library/MvComPhyLib.h (100%)
 rename {Platform => Silicon}/Marvell/Include/Library/MvHwDescLib.h (100%)
 rename {Platform => Silicon}/Marvell/Include/Library/UtmiPhyLib.h (100%)
 rename {Platform => Silicon}/Marvell/Include/Protocol/Eeprom.h (100%)
 rename {Platform => Silicon}/Marvell/Include/Protocol/Mdio.h (100%)
 rename {Platform => Silicon}/Marvell/Include/Protocol/MvPhy.h (100%)
 rename {Platform => Silicon}/Marvell/Include/Protocol/Spi.h (100%)
 rename {Platform => Silicon}/Marvell/Include/Protocol/SpiFlash.h (100%)
 rename {Platform => Silicon}/Marvell/Library/ComPhyLib/ComPhyCp110.c (100%)
 rename {Platform => Silicon}/Marvell/Library/ComPhyLib/ComPhyLib.c (100%)
 rename {Platform => Silicon}/Marvell/Library/ComPhyLib/ComPhyLib.h (100%)
 rename {Platform => Silicon}/Marvell/Library/ComPhyLib/ComPhyLib.inf (96%)
 rename {Platform => Silicon}/Marvell/Library/ComPhyLib/ComPhyMux.c (100%)
 rename {Platform => Silicon}/Marvell/Library/MppLib/MppLib.c (100%)
 rename {Platform => Silicon}/Marvell/Library/MppLib/MppLib.inf (96%)
 rename {Platform => Silicon}/Marvell/Library/UtmiPhyLib/UtmiPhyLib.c (100%)
 rename {Platform => Silicon}/Marvell/Library/UtmiPhyLib/UtmiPhyLib.h (100%)
 rename {Platform => Silicon}/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf (96%)
 rename {Platform => Silicon}/Marvell/Marvell.dec (100%)
 rename {Platform => Silicon}/Marvell/PciEmulation/PciEmulation.c (100%)
 rename {Platform => Silicon}/Marvell/PciEmulation/PciEmulation.inf (96%)

diff --git a/Platform/Marvell/Armada/Armada70x0.dsc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
similarity index 95%
rename from Platform/Marvell/Armada/Armada70x0.dsc
rename to Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
index 8e4cdb2..46a1ea9 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
similarity index 91%
rename from Platform/Marvell/Armada/Armada70x0.fdf
rename to Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
index c03bc42..f63f42d 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
similarity index 100%
rename from Platform/Marvell/Applications/EepromCmd/EepromCmd.c
rename to Silicon/Marvell/Applications/EepromCmd/EepromCmd.c
diff --git a/Platform/Marvell/Applications/EepromCmd/EepromCmd.inf b/Silicon/Marvell/Applications/EepromCmd/EepromCmd.inf
similarity index 95%
rename from Platform/Marvell/Applications/EepromCmd/EepromCmd.inf
rename to Silicon/Marvell/Applications/EepromCmd/EepromCmd.inf
index 984e60f..c86ead1 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
similarity index 100%
rename from Platform/Marvell/Applications/EepromCmd/EepromCmd.uni
rename to Silicon/Marvell/Applications/EepromCmd/EepromCmd.uni
diff --git a/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.c b/Silicon/Marvell/Applications/FirmwareUpdate/FUpdate.c
similarity index 100%
rename from Platform/Marvell/Applications/FirmwareUpdate/FUpdate.c
rename to Silicon/Marvell/Applications/FirmwareUpdate/FUpdate.c
diff --git a/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.inf b/Silicon/Marvell/Applications/FirmwareUpdate/FUpdate.inf
similarity index 95%
rename from Platform/Marvell/Applications/FirmwareUpdate/FUpdate.inf
rename to Silicon/Marvell/Applications/FirmwareUpdate/FUpdate.inf
index 53ea491..69ee0f8 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
similarity index 100%
rename from Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni
rename to Silicon/Marvell/Applications/FirmwareUpdate/FUpdate.uni
diff --git a/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c b/Silicon/Marvell/Applications/SpiTool/SpiFlashCmd.c
similarity index 100%
rename from Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c
rename to Silicon/Marvell/Applications/SpiTool/SpiFlashCmd.c
diff --git a/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.inf b/Silicon/Marvell/Applications/SpiTool/SpiFlashCmd.inf
similarity index 95%
rename from Platform/Marvell/Applications/SpiTool/SpiFlashCmd.inf
rename to Silicon/Marvell/Applications/SpiTool/SpiFlashCmd.inf
index a52906b..647ab50 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
similarity index 100%
rename from Platform/Marvell/Applications/SpiTool/SpiFlashCmd.uni
rename to Silicon/Marvell/Applications/SpiTool/SpiFlashCmd.uni
diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
similarity index 93%
rename from Platform/Marvell/Armada/Armada.dsc.inc
rename to Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 4b29691..75717e9 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
similarity index 100%
rename from Platform/Marvell/Armada/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.c
rename to 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
similarity index 93%
rename from Platform/Marvell/Armada/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf
rename to Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf
index 189ffc5..3d74c8e 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
similarity index 100%
rename from Platform/Marvell/Armada/Drivers/PlatInitDxe/PlatInitDxe.c
rename to 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
similarity index 93%
rename from Platform/Marvell/Armada/Drivers/PlatInitDxe/PlatInitDxe.inf
rename to Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf
index 790b7e3..803dc6e 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
similarity index 100%
rename from Platform/Marvell/Armada/Library/Armada70x0Lib/AArch64/ArmPlatformHelper.S
rename to 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
similarity index 100%
rename from Platform/Marvell/Armada/Library/Armada70x0Lib/ARM/ArmPlatformHelper.S
rename to 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
similarity index 100%
rename from Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.c
rename to 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
similarity index 96%
rename from Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0Lib.inf
rename to Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.inf
index 71abdd4..4d4edc8 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
similarity index 100%
rename from Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0LibMem.c
rename to 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
similarity index 100%
rename from Platform/Marvell/Armada/Library/Armada70x0Lib/Armada70x0LibMem.h
rename to 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
similarity index 100%
rename from Platform/Marvell/Armada/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.c
rename to 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
similarity index 94%
rename from Platform/Marvell/Armada/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf
rename to Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf
index ebaed01..adc5b9a 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
similarity index 100%
rename from Platform/Marvell/Armada/Library/RealTimeClockLib/RealTimeClockLib.c
rename to 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
similarity index 100%
rename from Platform/Marvell/Armada/Library/RealTimeClockLib/RealTimeClockLib.h
rename to 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
similarity index 94%
rename from Platform/Marvell/Armada/Library/RealTimeClockLib/RealTimeClockLib.inf
rename to Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
index 01c25f5..2f842e8 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
similarity index 100%
rename from Platform/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.c
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.h
rename to 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
similarity index 96%
rename from Platform/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf
rename to Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf
index a50f8b9..510b550 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
similarity index 100%
rename from Platform/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.c
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.h
rename to 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
similarity index 96%
rename from Platform/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf
rename to Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf
index 80655f1..a7cf52e 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
similarity index 100%
rename from Platform/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.c
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.h
rename to 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
similarity index 96%
rename from Platform/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
rename to Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
index d9878eb..c070785 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
similarity index 100%
rename from Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h
rename to 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
similarity index 96%
rename from Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf
rename to Silicon/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf
index 2abd673..fe0f554 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
similarity index 100%
rename from Platform/Marvell/Drivers/Net/Pp2Dxe/Mvpp2Lib.c
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/Net/Pp2Dxe/Mvpp2Lib.h
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/Net/Pp2Dxe/Mvpp2LibHw.h
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h
rename to 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
similarity index 96%
rename from Platform/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
rename to Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
index b4568d8..fcd0611 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
similarity index 100%
rename from Platform/Marvell/Drivers/SdMmc/XenonDxe/ComponentName.c
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/SdMmc/XenonDxe/EmmcDevice.c
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/SdMmc/XenonDxe/SdDevice.c
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.c
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.h
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.inf
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxe.uni
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHcDxeExtra.uni
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHci.c
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/SdMmc/XenonDxe/SdMmcPciHci.h
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/SdMmc/XenonDxe/XenonSdhci.c
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/SdMmc/XenonDxe/XenonSdhci.h
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/Spi/Devices/MvSpiFlash.c
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/Spi/Devices/MvSpiFlash.h
rename to 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
similarity index 96%
rename from Platform/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf
rename to Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf
index c6bbe5e..bc88a7e 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
similarity index 100%
rename from Platform/Marvell/Drivers/Spi/MvSpiDxe.c
rename to Silicon/Marvell/Drivers/Spi/MvSpiDxe.c
diff --git a/Platform/Marvell/Drivers/Spi/MvSpiDxe.h b/Silicon/Marvell/Drivers/Spi/MvSpiDxe.h
similarity index 100%
rename from Platform/Marvell/Drivers/Spi/MvSpiDxe.h
rename to Silicon/Marvell/Drivers/Spi/MvSpiDxe.h
diff --git a/Platform/Marvell/Drivers/Spi/MvSpiDxe.inf b/Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
similarity index 96%
rename from Platform/Marvell/Drivers/Spi/MvSpiDxe.inf
rename to Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
index ac0e407..e7bc170 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
similarity index 100%
rename from Platform/Marvell/Drivers/Spi/Variables/MvFvbDxe.c
rename to 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
similarity index 100%
rename from Platform/Marvell/Drivers/Spi/Variables/MvFvbDxe.h
rename to 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
similarity index 96%
rename from Platform/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf
rename to Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf
index 5d73c21..117fe8b 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
similarity index 100%
rename from Platform/Marvell/Include/Library/MppLib.h
rename to Silicon/Marvell/Include/Library/MppLib.h
diff --git a/Platform/Marvell/Include/Library/MvComPhyLib.h b/Silicon/Marvell/Include/Library/MvComPhyLib.h
similarity index 100%
rename from Platform/Marvell/Include/Library/MvComPhyLib.h
rename to Silicon/Marvell/Include/Library/MvComPhyLib.h
diff --git a/Platform/Marvell/Include/Library/MvHwDescLib.h b/Silicon/Marvell/Include/Library/MvHwDescLib.h
similarity index 100%
rename from Platform/Marvell/Include/Library/MvHwDescLib.h
rename to Silicon/Marvell/Include/Library/MvHwDescLib.h
diff --git a/Platform/Marvell/Include/Library/UtmiPhyLib.h b/Silicon/Marvell/Include/Library/UtmiPhyLib.h
similarity index 100%
rename from Platform/Marvell/Include/Library/UtmiPhyLib.h
rename to Silicon/Marvell/Include/Library/UtmiPhyLib.h
diff --git a/Platform/Marvell/Include/Protocol/Eeprom.h b/Silicon/Marvell/Include/Protocol/Eeprom.h
similarity index 100%
rename from Platform/Marvell/Include/Protocol/Eeprom.h
rename to Silicon/Marvell/Include/Protocol/Eeprom.h
diff --git a/Platform/Marvell/Include/Protocol/Mdio.h b/Silicon/Marvell/Include/Protocol/Mdio.h
similarity index 100%
rename from Platform/Marvell/Include/Protocol/Mdio.h
rename to Silicon/Marvell/Include/Protocol/Mdio.h
diff --git a/Platform/Marvell/Include/Protocol/MvPhy.h b/Silicon/Marvell/Include/Protocol/MvPhy.h
similarity index 100%
rename from Platform/Marvell/Include/Protocol/MvPhy.h
rename to Silicon/Marvell/Include/Protocol/MvPhy.h
diff --git a/Platform/Marvell/Include/Protocol/Spi.h b/Silicon/Marvell/Include/Protocol/Spi.h
similarity index 100%
rename from Platform/Marvell/Include/Protocol/Spi.h
rename to Silicon/Marvell/Include/Protocol/Spi.h
diff --git a/Platform/Marvell/Include/Protocol/SpiFlash.h b/Silicon/Marvell/Include/Protocol/SpiFlash.h
similarity index 100%
rename from Platform/Marvell/Include/Protocol/SpiFlash.h
rename to Silicon/Marvell/Include/Protocol/SpiFlash.h
diff --git a/Platform/Marvell/Library/ComPhyLib/ComPhyCp110.c b/Silicon/Marvell/Library/ComPhyLib/ComPhyCp110.c
similarity index 100%
rename from Platform/Marvell/Library/ComPhyLib/ComPhyCp110.c
rename to Silicon/Marvell/Library/ComPhyLib/ComPhyCp110.c
diff --git a/Platform/Marvell/Library/ComPhyLib/ComPhyLib.c b/Silicon/Marvell/Library/ComPhyLib/ComPhyLib.c
similarity index 100%
rename from Platform/Marvell/Library/ComPhyLib/ComPhyLib.c
rename to Silicon/Marvell/Library/ComPhyLib/ComPhyLib.c
diff --git a/Platform/Marvell/Library/ComPhyLib/ComPhyLib.h b/Silicon/Marvell/Library/ComPhyLib/ComPhyLib.h
similarity index 100%
rename from Platform/Marvell/Library/ComPhyLib/ComPhyLib.h
rename to Silicon/Marvell/Library/ComPhyLib/ComPhyLib.h
diff --git a/Platform/Marvell/Library/ComPhyLib/ComPhyLib.inf b/Silicon/Marvell/Library/ComPhyLib/ComPhyLib.inf
similarity index 96%
rename from Platform/Marvell/Library/ComPhyLib/ComPhyLib.inf
rename to Silicon/Marvell/Library/ComPhyLib/ComPhyLib.inf
index c223fe5..a1584b4 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
similarity index 100%
rename from Platform/Marvell/Library/ComPhyLib/ComPhyMux.c
rename to Silicon/Marvell/Library/ComPhyLib/ComPhyMux.c
diff --git a/Platform/Marvell/Library/MppLib/MppLib.c b/Silicon/Marvell/Library/MppLib/MppLib.c
similarity index 100%
rename from Platform/Marvell/Library/MppLib/MppLib.c
rename to Silicon/Marvell/Library/MppLib/MppLib.c
diff --git a/Platform/Marvell/Library/MppLib/MppLib.inf b/Silicon/Marvell/Library/MppLib/MppLib.inf
similarity index 96%
rename from Platform/Marvell/Library/MppLib/MppLib.inf
rename to Silicon/Marvell/Library/MppLib/MppLib.inf
index 1268542..9d7e9f0 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
similarity index 100%
rename from Platform/Marvell/Library/UtmiPhyLib/UtmiPhyLib.c
rename to Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.c
diff --git a/Platform/Marvell/Library/UtmiPhyLib/UtmiPhyLib.h b/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.h
similarity index 100%
rename from Platform/Marvell/Library/UtmiPhyLib/UtmiPhyLib.h
rename to Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.h
diff --git a/Platform/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf b/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf
similarity index 96%
rename from Platform/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf
rename to Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf
index b56c43b..0876879 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
similarity index 100%
rename from Platform/Marvell/Marvell.dec
rename to Silicon/Marvell/Marvell.dec
diff --git a/Platform/Marvell/PciEmulation/PciEmulation.c b/Silicon/Marvell/PciEmulation/PciEmulation.c
similarity index 100%
rename from Platform/Marvell/PciEmulation/PciEmulation.c
rename to Silicon/Marvell/PciEmulation/PciEmulation.c
diff --git a/Platform/Marvell/PciEmulation/PciEmulation.inf b/Silicon/Marvell/PciEmulation/PciEmulation.inf
similarity index 96%
rename from Platform/Marvell/PciEmulation/PciEmulation.inf
rename to Silicon/Marvell/PciEmulation/PciEmulation.inf
index 45490eb..c6a3c99 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
-- 
2.7.4



  reply	other threads:[~2017-12-07 19:16 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-07 19:20 [platforms: PATCH v2 0/5] Armada 7k/8k files reorganization Marcin Wojtas
2017-12-07 19:20 ` Marcin Wojtas [this message]
2017-12-07 19:20 ` [platforms: PATCH v2 2/5] Marvell/Armada7k8k: Use '7k8k' prefix in the SoC drivers/libraries Marcin Wojtas
2017-12-07 19:20 ` [platforms: PATCH v2 3/5] Marvell/Armada70x0Db: Rename fd file Marcin Wojtas
2017-12-07 19:20 ` [platforms: PATCH v2 4/5] Marvell/Drivers: Rename SPI master driver Marcin Wojtas
2017-12-07 19:48   ` Ard Biesheuvel
2017-12-07 23:01     ` Marcin Wojtas
2017-12-07 19:20 ` [platforms: PATCH v2 5/5] Marvell/Drivers: Drop 'PciEmulation' naming Marcin Wojtas
2017-12-07 19:49   ` Ard Biesheuvel
2017-12-07 23:08     ` Marcin Wojtas
2017-12-08  8:40       ` Ard Biesheuvel
2017-12-08 12:11         ` Marcin Wojtas
2017-12-08 14:08           ` Leif Lindholm
2017-12-08 14:13             ` Marcin Wojtas
2017-12-08 14:23               ` Leif Lindholm

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1512674434-32326-2-git-send-email-mw@semihalf.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox