* [platforms: PATCH v2 1/5] Marvell: Reorganize file structure
2017-12-07 19:20 [platforms: PATCH v2 0/5] Armada 7k/8k files reorganization Marcin Wojtas
@ 2017-12-07 19:20 ` Marcin Wojtas
2017-12-07 19:20 ` [platforms: PATCH v2 2/5] Marvell/Armada7k8k: Use '7k8k' prefix in the SoC drivers/libraries Marcin Wojtas
` (3 subsequent siblings)
4 siblings, 0 replies; 15+ messages in thread
From: Marcin Wojtas @ 2017-12-07 19:20 UTC (permalink / raw)
To: edk2-devel
Cc: leif.lindholm, ard.biesheuvel, nadavh, neta, kostap, jinghua, mw,
jsd, ka
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
| 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
^ permalink raw reply related [flat|nested] 15+ messages in thread* [platforms: PATCH v2 2/5] Marvell/Armada7k8k: Use '7k8k' prefix in the SoC drivers/libraries
2017-12-07 19:20 [platforms: PATCH v2 0/5] Armada 7k/8k files reorganization Marcin Wojtas
2017-12-07 19:20 ` [platforms: PATCH v2 1/5] Marvell: Reorganize file structure Marcin Wojtas
@ 2017-12-07 19:20 ` Marcin Wojtas
2017-12-07 19:20 ` [platforms: PATCH v2 3/5] Marvell/Armada70x0Db: Rename fd file Marcin Wojtas
` (2 subsequent siblings)
4 siblings, 0 replies; 15+ messages in thread
From: Marcin Wojtas @ 2017-12-07 19:20 UTC (permalink / raw)
To: edk2-devel
Cc: leif.lindholm, ard.biesheuvel, nadavh, neta, kostap, jinghua, mw,
jsd, ka
As a part of files reorganization, switch to using '7k8k'
in all SoC-specific driver/library code instead of
'70x0'/'7040', so that to ensure consistent naming for
entire SoC family.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf | 2 +-
Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 6 +++---
Silicon/Marvell/Armada7k8k/Drivers/{Armada70x0RngDxe/Armada70x0RngDxe.c => Armada7k8kRngDxe/Armada7k8kRngDxe.c} | 14 +++++++-------
Silicon/Marvell/Armada7k8k/Drivers/{Armada70x0RngDxe/Armada70x0RngDxe.inf => Armada7k8kRngDxe/Armada7k8kRngDxe.inf} | 6 +++---
Silicon/Marvell/Armada7k8k/Library/{Armada70x0Lib => Armada7k8kLib}/AArch64/ArmPlatformHelper.S | 0
Silicon/Marvell/Armada7k8k/Library/{Armada70x0Lib => Armada7k8kLib}/ARM/ArmPlatformHelper.S | 0
Silicon/Marvell/Armada7k8k/Library/{Armada70x0Lib/Armada70x0Lib.c => Armada7k8kLib/Armada7k8kLib.c} | 6 +++---
Silicon/Marvell/Armada7k8k/Library/{Armada70x0Lib/Armada70x0Lib.inf => Armada7k8kLib/Armada7k8kLib.inf} | 10 +++++-----
Silicon/Marvell/Armada7k8k/Library/{Armada70x0Lib/Armada70x0LibMem.c => Armada7k8kLib/Armada7k8kLibMem.c} | 2 +-
Silicon/Marvell/Armada7k8k/Library/{Armada70x0Lib/Armada70x0LibMem.h => Armada7k8kLib/Armada7k8kLibMem.h} | 0
Silicon/Marvell/Armada7k8k/Library/{Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.c => Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c} | 0
Silicon/Marvell/Armada7k8k/Library/{Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf => Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf} | 4 ++--
12 files changed, 25 insertions(+), 25 deletions(-)
rename Silicon/Marvell/Armada7k8k/Drivers/{Armada70x0RngDxe/Armada70x0RngDxe.c => Armada7k8kRngDxe/Armada7k8kRngDxe.c} (94%)
rename Silicon/Marvell/Armada7k8k/Drivers/{Armada70x0RngDxe/Armada70x0RngDxe.inf => Armada7k8kRngDxe/Armada7k8kRngDxe.inf} (85%)
rename Silicon/Marvell/Armada7k8k/Library/{Armada70x0Lib => Armada7k8kLib}/AArch64/ArmPlatformHelper.S (100%)
rename Silicon/Marvell/Armada7k8k/Library/{Armada70x0Lib => Armada7k8kLib}/ARM/ArmPlatformHelper.S (100%)
rename Silicon/Marvell/Armada7k8k/Library/{Armada70x0Lib/Armada70x0Lib.c => Armada7k8kLib/Armada7k8kLib.c} (90%)
rename Silicon/Marvell/Armada7k8k/Library/{Armada70x0Lib/Armada70x0Lib.inf => Armada7k8kLib/Armada7k8kLib.inf} (93%)
rename Silicon/Marvell/Armada7k8k/Library/{Armada70x0Lib/Armada70x0LibMem.c => Armada7k8kLib/Armada7k8kLibMem.c} (96%)
rename Silicon/Marvell/Armada7k8k/Library/{Armada70x0Lib/Armada70x0LibMem.h => Armada7k8kLib/Armada7k8kLibMem.h} (100%)
rename Silicon/Marvell/Armada7k8k/Library/{Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.c => Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c} (100%)
rename Silicon/Marvell/Armada7k8k/Library/{Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf => Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf} (90%)
diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
index f63f42d..bba449a 100644
--- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
@@ -112,7 +112,7 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
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
+ INF Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
# Variable services
INF Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 75717e9..7d87766 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -32,7 +32,7 @@
#SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
[LibraryClasses.common]
- ArmPlatformLib|Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.inf
+ ArmPlatformLib|Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.inf
ComPhyLib|Silicon/Marvell/Library/ComPhyLib/ComPhyLib.inf
MppLib|Silicon/Marvell/Library/MppLib/MppLib.inf
NorFlashInfoLib|EmbeddedPkg/Library/NorFlashInfoLib/NorFlashInfoLib.inf
@@ -149,7 +149,7 @@
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
[LibraryClasses.common.SEC, LibraryClasses.common.PEIM]
- MemoryInitPeiLib|Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf
+ MemoryInitPeiLib|Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf
BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
[LibraryClasses.common.DXE_CORE]
@@ -413,7 +413,7 @@
Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf
Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf
- Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf
+ Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
# Network support
MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
diff --git a/Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.c b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c
similarity index 94%
rename from Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.c
rename to Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c
index 014443d..2cbc3e4 100644
--- a/Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.c
+++ b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c
@@ -87,7 +87,7 @@ STATIC EFI_PHYSICAL_ADDRESS mTrngBaseAddress;
STATIC
EFI_STATUS
EFIAPI
-Armada70x0RngGetInfo (
+Armada7k8kRngGetInfo (
IN EFI_RNG_PROTOCOL *This,
IN OUT UINTN *RNGAlgorithmListSize,
OUT EFI_RNG_ALGORITHM *RNGAlgorithmList
@@ -171,7 +171,7 @@ GetTrngData (
STATIC
EFI_STATUS
EFIAPI
-Armada70x0RngGetRNG (
+Armada7k8kRngGetRNG (
IN EFI_RNG_PROTOCOL *This,
IN EFI_RNG_ALGORITHM *RNGAlgorithm, OPTIONAL
IN UINTN RNGValueLength,
@@ -207,9 +207,9 @@ Armada70x0RngGetRNG (
return EFI_SUCCESS;
}
-STATIC EFI_RNG_PROTOCOL mArmada70x0RngProtocol = {
- Armada70x0RngGetInfo,
- Armada70x0RngGetRNG
+STATIC EFI_RNG_PROTOCOL mArmada7k8kRngProtocol = {
+ Armada7k8kRngGetInfo,
+ Armada7k8kRngGetRNG
};
//
@@ -217,7 +217,7 @@ STATIC EFI_RNG_PROTOCOL mArmada70x0RngProtocol = {
//
EFI_STATUS
EFIAPI
-Armada70x0RngDxeEntryPoint (
+Armada7k8kRngDxeEntryPoint (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
@@ -249,7 +249,7 @@ Armada70x0RngDxeEntryPoint (
return SystemTable->BootServices->InstallMultipleProtocolInterfaces (
&ImageHandle,
&gEfiRngProtocolGuid,
- &mArmada70x0RngProtocol,
+ &mArmada7k8kRngProtocol,
NULL
);
}
diff --git a/Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
similarity index 85%
rename from Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf
rename to Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
index 3d74c8e..e6561f3 100644
--- a/Silicon/Marvell/Armada7k8k/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf
+++ b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
@@ -15,14 +15,14 @@
[Defines]
INF_VERSION = 0x00010019
- BASE_NAME = Armada70x0RngDxe
+ BASE_NAME = Armada7k8kRngDxe
FILE_GUID = dd87096a-cae5-4328-bec1-2ddb755f2e08
MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0
- ENTRY_POINT = Armada70x0RngDxeEntryPoint
+ ENTRY_POINT = Armada7k8kRngDxeEntryPoint
[Sources]
- Armada70x0RngDxe.c
+ Armada7k8kRngDxe.c
[Packages]
MdePkg/MdePkg.dec
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/AArch64/ArmPlatformHelper.S b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S
similarity index 100%
rename from Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/AArch64/ArmPlatformHelper.S
rename to Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/ARM/ArmPlatformHelper.S b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S
similarity index 100%
rename from Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/ARM/ArmPlatformHelper.S
rename to Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c
similarity index 90%
rename from Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.c
rename to Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c
index b2b4155..233f7b1 100644
--- a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.c
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c
@@ -17,7 +17,7 @@
#include <Library/ArmPlatformLib.h>
#include <Ppi/ArmMpCoreInfo.h>
-ARM_CORE_INFO mArmada7040MpCoreInfoTable[] = {
+ARM_CORE_INFO mArmada7k8kMpCoreInfoTable[] = {
{
// Cluster 0, Core 0
0x0, 0x0,
@@ -96,8 +96,8 @@ PrePeiCoreGetMpCoreInfo (
)
{
if (ArmIsMpCore()) {
- *CoreCount = sizeof(mArmada7040MpCoreInfoTable) / sizeof(ARM_CORE_INFO);
- *ArmCoreTable = mArmada7040MpCoreInfoTable;
+ *CoreCount = sizeof(mArmada7k8kMpCoreInfoTable) / sizeof(ARM_CORE_INFO);
+ *ArmCoreTable = mArmada7k8kMpCoreInfoTable;
return EFI_SUCCESS;
} else {
return EFI_UNSUPPORTED;
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.inf b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.inf
similarity index 93%
rename from Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.inf
rename to Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.inf
index 4d4edc8..d38b467 100644
--- a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0Lib.inf
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.inf
@@ -32,17 +32,17 @@
[Defines]
INF_VERSION = 0x00010005
- BASE_NAME = Armada7040Lib
+ BASE_NAME = Armada7k8kLib
FILE_GUID = 3f29b642-4a49-4dfd-8f4a-205dd38432bb
MODULE_TYPE = BASE
VERSION_STRING = 1.0
LIBRARY_CLASS = ArmPlatformLib
[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
ArmPkg/ArmPkg.dec
ArmPlatformPkg/ArmPlatformPkg.dec
+ MdeModulePkg/MdeModulePkg.dec
+ MdePkg/MdePkg.dec
Silicon/Marvell/Marvell.dec
[LibraryClasses]
@@ -54,8 +54,8 @@
UtmiPhyLib
[Sources.common]
- Armada70x0Lib.c
- Armada70x0LibMem.c
+ Armada7k8kLib.c
+ Armada7k8kLibMem.c
[Sources.AArch64]
AArch64/ArmPlatformHelper.S
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0LibMem.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLibMem.c
similarity index 96%
rename from Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0LibMem.c
rename to Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLibMem.c
index f384415..2a4f5ad 100644
--- a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0LibMem.c
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLibMem.c
@@ -39,7 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <Library/IoLib.h>
#include <Library/MemoryAllocationLib.h>
-#include "Armada70x0LibMem.h"
+#include "Armada7k8kLibMem.h"
// The total number of descriptors, including the final "end-of-table" descriptor.
#define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS 16
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0LibMem.h b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLibMem.h
similarity index 100%
rename from Silicon/Marvell/Armada7k8k/Library/Armada70x0Lib/Armada70x0LibMem.h
rename to Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLibMem.h
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c
similarity index 100%
rename from Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.c
rename to Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf
similarity index 90%
rename from Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf
rename to Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf
index adc5b9a..096495d 100644
--- a/Silicon/Marvell/Armada7k8k/Library/Armada70x0MemoryInitPeiLib/Armada70x0MemoryInitPeiLib.inf
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf
@@ -15,14 +15,14 @@
[Defines]
INF_VERSION = 0x00010019
- BASE_NAME = Armada70x0MemoryInitPeiLib
+ BASE_NAME = Armada7k8kMemoryInitPeiLib
FILE_GUID = abc4e8a7-89a7-4aea-92bc-0e9421c4a473
MODULE_TYPE = BASE
VERSION_STRING = 1.0
LIBRARY_CLASS = MemoryInitPeiLib|SEC PEIM
[Sources]
- Armada70x0MemoryInitPeiLib.c
+ Armada7k8kMemoryInitPeiLib.c
[Packages]
ArmPkg/ArmPkg.dec
--
2.7.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* [platforms: PATCH v2 3/5] Marvell/Armada70x0Db: Rename fd file
2017-12-07 19:20 [platforms: PATCH v2 0/5] Armada 7k/8k files reorganization Marcin Wojtas
2017-12-07 19:20 ` [platforms: PATCH v2 1/5] Marvell: Reorganize file structure Marcin Wojtas
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 ` Marcin Wojtas
2017-12-07 19:20 ` [platforms: PATCH v2 4/5] Marvell/Drivers: Rename SPI master driver Marcin Wojtas
2017-12-07 19:20 ` [platforms: PATCH v2 5/5] Marvell/Drivers: Drop 'PciEmulation' naming Marcin Wojtas
4 siblings, 0 replies; 15+ messages in thread
From: Marcin Wojtas @ 2017-12-07 19:20 UTC (permalink / raw)
To: edk2-devel
Cc: leif.lindholm, ard.biesheuvel, nadavh, neta, kostap, jinghua, mw,
jsd, ka
Hitherto fd file name was pretty generic, so use one,
which reflects actual board model.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
index bba449a..3b0646e 100644
--- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
@@ -24,7 +24,7 @@
#
################################################################################
-[FD.Armada70x0_EFI]
+[FD.Armada70x0Db_EFI]
BaseAddress = 0x00000000|gArmTokenSpaceGuid.PcdFdBaseAddress # The base address of the Firmware in NOR Flash.
Size = 0x00400000|gArmTokenSpaceGuid.PcdFdSize # The size in bytes of the FLASH Device
ErasePolarity = 1
--
2.7.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [platforms: PATCH v2 4/5] Marvell/Drivers: Rename SPI master driver
2017-12-07 19:20 [platforms: PATCH v2 0/5] Armada 7k/8k files reorganization Marcin Wojtas
` (2 preceding siblings ...)
2017-12-07 19:20 ` [platforms: PATCH v2 3/5] Marvell/Armada70x0Db: Rename fd file Marcin Wojtas
@ 2017-12-07 19:20 ` Marcin Wojtas
2017-12-07 19:48 ` Ard Biesheuvel
2017-12-07 19:20 ` [platforms: PATCH v2 5/5] Marvell/Drivers: Drop 'PciEmulation' naming Marcin Wojtas
4 siblings, 1 reply; 15+ messages in thread
From: Marcin Wojtas @ 2017-12-07 19:20 UTC (permalink / raw)
To: edk2-devel
Cc: leif.lindholm, ard.biesheuvel, nadavh, neta, kostap, jinghua, mw,
jsd, ka
Hitherto driver name was very generic. In order to be ready
for adding new SPI master drivers, use the controller's
traditional name (it's called SPI Orion in Linux and
U-Boot) for files and the entry point.
Additionally, move the files to new 'Controllers' directory,
which is paralel to existing 'Devices' and 'Variables', so
that to make the separation more clear.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf | 2 +-
Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 2 +-
Silicon/Marvell/Drivers/Spi/{MvSpiDxe.c => Controllers/MvSpiOrionDxe.c} | 4 ++--
Silicon/Marvell/Drivers/Spi/{MvSpiDxe.h => Controllers/MvSpiOrionDxe.h} | 0
Silicon/Marvell/Drivers/Spi/{MvSpiDxe.inf => Controllers/MvSpiOrionDxe.inf} | 8 ++++----
5 files changed, 8 insertions(+), 8 deletions(-)
rename Silicon/Marvell/Drivers/Spi/{MvSpiDxe.c => Controllers/MvSpiOrionDxe.c} (95%)
rename Silicon/Marvell/Drivers/Spi/{MvSpiDxe.h => Controllers/MvSpiOrionDxe.h} (100%)
rename Silicon/Marvell/Drivers/Spi/{MvSpiDxe.inf => Controllers/MvSpiOrionDxe.inf} (92%)
diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
index 3b0646e..6d57b9a 100644
--- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
@@ -110,7 +110,7 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
INF Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf
INF MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf
INF Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf
- INF Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
+ INF Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
INF Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf
INF Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 7d87766..0eb3ef3 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -411,7 +411,7 @@
Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf
MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf
Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf
- Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
+ Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf
Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
diff --git a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.c b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.c
similarity index 95%
rename from Silicon/Marvell/Drivers/Spi/MvSpiDxe.c
rename to Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.c
index bab6cf4..c657daf 100755
--- a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.c
+++ b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.c
@@ -31,7 +31,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*******************************************************************************/
-#include "MvSpiDxe.h"
+#include "MvSpiOrionDxe.h"
SPI_MASTER *mSpiMasterInstance;
@@ -399,7 +399,7 @@ SpiMasterInitProtocol (
EFI_STATUS
EFIAPI
-SpiMasterEntryPoint (
+SpiOrionEntryPoint (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
diff --git a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.h b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.h
similarity index 100%
rename from Silicon/Marvell/Drivers/Spi/MvSpiDxe.h
rename to Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.h
diff --git a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
similarity index 92%
rename from Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
rename to Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
index e7bc170..3f85b40 100644
--- a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
+++ b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
@@ -31,15 +31,15 @@
[Defines]
INF_VERSION = 0x00010005
- BASE_NAME = SpiMasterDxe
+ BASE_NAME = SpiOrionDxe
FILE_GUID = c19dbc8a-f4f9-43b0-aee5-802e3ed03d15
MODULE_TYPE = DXE_RUNTIME_DRIVER
VERSION_STRING = 1.0
- ENTRY_POINT = SpiMasterEntryPoint
+ ENTRY_POINT = SpiOrionEntryPoint
[Sources]
- MvSpiDxe.c
- MvSpiDxe.h
+ MvSpiOrionDxe.c
+ MvSpiOrionDxe.h
[Packages]
EmbeddedPkg/EmbeddedPkg.dec
--
2.7.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [platforms: PATCH v2 4/5] Marvell/Drivers: Rename SPI master driver
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
0 siblings, 1 reply; 15+ messages in thread
From: Ard Biesheuvel @ 2017-12-07 19:48 UTC (permalink / raw)
To: Marcin Wojtas
Cc: edk2-devel@lists.01.org, Leif Lindholm, Nadav Haklai,
Neta Zur Hershkovits, Kostya Porotchkin, Hua Jing,
Jan Dąbroś, ka
Hi Marcin,
On 7 December 2017 at 19:20, Marcin Wojtas <mw@semihalf.com> wrote:
> Hitherto driver name was very generic. In order to be ready
> for adding new SPI master drivers, use the controller's
> traditional name (it's called SPI Orion in Linux and
> U-Boot) for files and the entry point.
>
> Additionally, move the files to new 'Controllers' directory,
> which is paralel to existing 'Devices' and 'Variables', so
> that to make the separation more clear.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
> Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf | 2 +-
> Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 2 +-
> Silicon/Marvell/Drivers/Spi/{MvSpiDxe.c => Controllers/MvSpiOrionDxe.c} | 4 ++--
> Silicon/Marvell/Drivers/Spi/{MvSpiDxe.h => Controllers/MvSpiOrionDxe.h} | 0
> Silicon/Marvell/Drivers/Spi/{MvSpiDxe.inf => Controllers/MvSpiOrionDxe.inf} | 8 ++++----
> 5 files changed, 8 insertions(+), 8 deletions(-)
> rename Silicon/Marvell/Drivers/Spi/{MvSpiDxe.c => Controllers/MvSpiOrionDxe.c} (95%)
> rename Silicon/Marvell/Drivers/Spi/{MvSpiDxe.h => Controllers/MvSpiOrionDxe.h} (100%)
> rename Silicon/Marvell/Drivers/Spi/{MvSpiDxe.inf => Controllers/MvSpiOrionDxe.inf} (92%)
I think this is not entirely correct. With these patches applied, we have
Silicon/Marvell/Drivers/Spi/Variables
Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.h
Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf
Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.c
Silicon/Marvell/Drivers/Spi/Devices
Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.h
Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.c
Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf
Silicon/Marvell/Drivers/Spi/Controllers
Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.h
Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.c
where each directory is named as if it could contain multiple drivers,
but given that each driver belongs in its own directory, we are
missing one directory level.
To be honest (but I will let Leif comment as well), I think you can
remove the Variables/Devices/Controllers distinction, and just have
Silicon/Marvell/Drivers/Spi/MvFvbDxe
Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h
Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.inf
Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
Silicon/Marvell/Drivers/Spi/MvSpiFlash
Silicon/Marvell/Drivers/Spi/MvSpiFlash/MvSpiFlash.h
Silicon/Marvell/Drivers/Spi/MvSpiFlash/MvSpiFlash.c
Silicon/Marvell/Drivers/Spi/MvSpiFlash/MvSpiFlash.inf
Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe
Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.h
Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.inf
Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.c
>
> diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
> index 3b0646e..6d57b9a 100644
> --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
> +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
> @@ -110,7 +110,7 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
> INF Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf
> INF MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf
> INF Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf
> - INF Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
> + INF Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
> INF Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf
> INF Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
>
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> index 7d87766..0eb3ef3 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> @@ -411,7 +411,7 @@
> Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf
> MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf
> Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf
> - Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
> + Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
> Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf
> Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
>
> diff --git a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.c b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.c
> similarity index 95%
> rename from Silicon/Marvell/Drivers/Spi/MvSpiDxe.c
> rename to Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.c
> index bab6cf4..c657daf 100755
> --- a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.c
> +++ b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.c
> @@ -31,7 +31,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>
> *******************************************************************************/
> -#include "MvSpiDxe.h"
> +#include "MvSpiOrionDxe.h"
>
> SPI_MASTER *mSpiMasterInstance;
>
> @@ -399,7 +399,7 @@ SpiMasterInitProtocol (
>
> EFI_STATUS
> EFIAPI
> -SpiMasterEntryPoint (
> +SpiOrionEntryPoint (
> IN EFI_HANDLE ImageHandle,
> IN EFI_SYSTEM_TABLE *SystemTable
> )
> diff --git a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.h b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.h
> similarity index 100%
> rename from Silicon/Marvell/Drivers/Spi/MvSpiDxe.h
> rename to Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.h
> diff --git a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
> similarity index 92%
> rename from Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
> rename to Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
> index e7bc170..3f85b40 100644
> --- a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
> +++ b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
> @@ -31,15 +31,15 @@
>
> [Defines]
> INF_VERSION = 0x00010005
> - BASE_NAME = SpiMasterDxe
> + BASE_NAME = SpiOrionDxe
> FILE_GUID = c19dbc8a-f4f9-43b0-aee5-802e3ed03d15
> MODULE_TYPE = DXE_RUNTIME_DRIVER
> VERSION_STRING = 1.0
> - ENTRY_POINT = SpiMasterEntryPoint
> + ENTRY_POINT = SpiOrionEntryPoint
>
> [Sources]
> - MvSpiDxe.c
> - MvSpiDxe.h
> + MvSpiOrionDxe.c
> + MvSpiOrionDxe.h
>
> [Packages]
> EmbeddedPkg/EmbeddedPkg.dec
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [platforms: PATCH v2 4/5] Marvell/Drivers: Rename SPI master driver
2017-12-07 19:48 ` Ard Biesheuvel
@ 2017-12-07 23:01 ` Marcin Wojtas
0 siblings, 0 replies; 15+ messages in thread
From: Marcin Wojtas @ 2017-12-07 23:01 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: edk2-devel@lists.01.org, Leif Lindholm, Nadav Haklai,
Neta Zur Hershkovits, Kostya Porotchkin, Hua Jing,
Jan Dąbroś, Konrad Adamczyk
Hi Ard,
2017-12-07 20:48 GMT+01:00 Ard Biesheuvel <ard.biesheuvel@linaro.org>:
> Hi Marcin,
>
> On 7 December 2017 at 19:20, Marcin Wojtas <mw@semihalf.com> wrote:
>> Hitherto driver name was very generic. In order to be ready
>> for adding new SPI master drivers, use the controller's
>> traditional name (it's called SPI Orion in Linux and
>> U-Boot) for files and the entry point.
>>
>> Additionally, move the files to new 'Controllers' directory,
>> which is paralel to existing 'Devices' and 'Variables', so
>> that to make the separation more clear.
>>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>> ---
>> Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf | 2 +-
>> Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 2 +-
>> Silicon/Marvell/Drivers/Spi/{MvSpiDxe.c => Controllers/MvSpiOrionDxe.c} | 4 ++--
>> Silicon/Marvell/Drivers/Spi/{MvSpiDxe.h => Controllers/MvSpiOrionDxe.h} | 0
>> Silicon/Marvell/Drivers/Spi/{MvSpiDxe.inf => Controllers/MvSpiOrionDxe.inf} | 8 ++++----
>> 5 files changed, 8 insertions(+), 8 deletions(-)
>> rename Silicon/Marvell/Drivers/Spi/{MvSpiDxe.c => Controllers/MvSpiOrionDxe.c} (95%)
>> rename Silicon/Marvell/Drivers/Spi/{MvSpiDxe.h => Controllers/MvSpiOrionDxe.h} (100%)
>> rename Silicon/Marvell/Drivers/Spi/{MvSpiDxe.inf => Controllers/MvSpiOrionDxe.inf} (92%)
>
> I think this is not entirely correct. With these patches applied, we have
>
> Silicon/Marvell/Drivers/Spi/Variables
> Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.h
> Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf
> Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.c
> Silicon/Marvell/Drivers/Spi/Devices
> Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.h
> Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.c
> Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf
> Silicon/Marvell/Drivers/Spi/Controllers
> Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.h
> Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
> Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.c
>
> where each directory is named as if it could contain multiple drivers,
> but given that each driver belongs in its own directory, we are
> missing one directory level.
>
> To be honest (but I will let Leif comment as well), I think you can
> remove the Variables/Devices/Controllers distinction, and just have
>
> Silicon/Marvell/Drivers/Spi/MvFvbDxe
> Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h
> Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.inf
> Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
> Silicon/Marvell/Drivers/Spi/MvSpiFlash
> Silicon/Marvell/Drivers/Spi/MvSpiFlash/MvSpiFlash.h
> Silicon/Marvell/Drivers/Spi/MvSpiFlash/MvSpiFlash.c
> Silicon/Marvell/Drivers/Spi/MvSpiFlash/MvSpiFlash.inf
> Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe
> Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.h
> Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.inf
> Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.c
>
Sure, I can use your naming convention. MvSpiFlash and MvFvbDxe are
generic in a way, that we need to only add new controller driver to
support a different SoC family (this willl happen with Armada 37xx
family).
Best regards,
Marcin
>
>>
>> diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
>> index 3b0646e..6d57b9a 100644
>> --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
>> +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
>> @@ -110,7 +110,7 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
>> INF Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf
>> INF MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf
>> INF Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf
>> - INF Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
>> + INF Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
>> INF Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf
>> INF Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
>>
>> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>> index 7d87766..0eb3ef3 100644
>> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>> @@ -411,7 +411,7 @@
>> Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf
>> MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf
>> Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf
>> - Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
>> + Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
>> Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf
>> Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
>>
>> diff --git a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.c b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.c
>> similarity index 95%
>> rename from Silicon/Marvell/Drivers/Spi/MvSpiDxe.c
>> rename to Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.c
>> index bab6cf4..c657daf 100755
>> --- a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.c
>> +++ b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.c
>> @@ -31,7 +31,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>> SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>>
>> *******************************************************************************/
>> -#include "MvSpiDxe.h"
>> +#include "MvSpiOrionDxe.h"
>>
>> SPI_MASTER *mSpiMasterInstance;
>>
>> @@ -399,7 +399,7 @@ SpiMasterInitProtocol (
>>
>> EFI_STATUS
>> EFIAPI
>> -SpiMasterEntryPoint (
>> +SpiOrionEntryPoint (
>> IN EFI_HANDLE ImageHandle,
>> IN EFI_SYSTEM_TABLE *SystemTable
>> )
>> diff --git a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.h b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.h
>> similarity index 100%
>> rename from Silicon/Marvell/Drivers/Spi/MvSpiDxe.h
>> rename to Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.h
>> diff --git a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
>> similarity index 92%
>> rename from Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
>> rename to Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
>> index e7bc170..3f85b40 100644
>> --- a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
>> +++ b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf
>> @@ -31,15 +31,15 @@
>>
>> [Defines]
>> INF_VERSION = 0x00010005
>> - BASE_NAME = SpiMasterDxe
>> + BASE_NAME = SpiOrionDxe
>> FILE_GUID = c19dbc8a-f4f9-43b0-aee5-802e3ed03d15
>> MODULE_TYPE = DXE_RUNTIME_DRIVER
>> VERSION_STRING = 1.0
>> - ENTRY_POINT = SpiMasterEntryPoint
>> + ENTRY_POINT = SpiOrionEntryPoint
>>
>> [Sources]
>> - MvSpiDxe.c
>> - MvSpiDxe.h
>> + MvSpiOrionDxe.c
>> + MvSpiOrionDxe.h
>>
>> [Packages]
>> EmbeddedPkg/EmbeddedPkg.dec
>> --
>> 2.7.4
>>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [platforms: PATCH v2 5/5] Marvell/Drivers: Drop 'PciEmulation' naming
2017-12-07 19:20 [platforms: PATCH v2 0/5] Armada 7k/8k files reorganization Marcin Wojtas
` (3 preceding siblings ...)
2017-12-07 19:20 ` [platforms: PATCH v2 4/5] Marvell/Drivers: Rename SPI master driver Marcin Wojtas
@ 2017-12-07 19:20 ` Marcin Wojtas
2017-12-07 19:49 ` Ard Biesheuvel
4 siblings, 1 reply; 15+ messages in thread
From: Marcin Wojtas @ 2017-12-07 19:20 UTC (permalink / raw)
To: edk2-devel
Cc: leif.lindholm, ard.biesheuvel, nadavh, neta, kostap, jinghua, mw,
jsd, ka
'PciEmulation' is not a proper naming for a driver, which
uses NonDiscoverableDeviceRegistrationLib for handling
the devices attached via internal bus of the SoC.
Rename it to MvNonDiscoverableDxe and move under
Silicon/Marvell/Drivers directory.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf | 4 +--
Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 4 +--
Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} | 26 ++++++++++----------
Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} | 8 +++---
4 files changed, 21 insertions(+), 21 deletions(-)
rename Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} (84%)
rename Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} (91%)
diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
index 6d57b9a..2bf409e 100644
--- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
@@ -135,8 +135,8 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
INF Silicon/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf
INF Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
- # PciEmulation
- INF Silicon/Marvell/PciEmulation/PciEmulation.inf
+ # NonDiscoverableDevices
+ INF Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf
INF MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
# SCSI
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 0eb3ef3..598810e 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -440,8 +440,8 @@
EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
- # PciEmulation
- Silicon/Marvell/PciEmulation/PciEmulation.inf
+ # NonDiscoverableDevices
+ Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf
MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
# SCSI
diff --git a/Silicon/Marvell/PciEmulation/PciEmulation.c b/Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c
similarity index 84%
rename from Silicon/Marvell/PciEmulation/PciEmulation.c
rename to Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c
index 35f1a87..abb2940 100644
--- a/Silicon/Marvell/PciEmulation/PciEmulation.c
+++ b/Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c
@@ -55,7 +55,7 @@ STATIC UINT8 * CONST SdhciDeviceTable = FixedPcdGetPtr (PcdPciESdhci);
//
STATIC
EFI_STATUS
-PciEmulationInitXhci (
+MvNonDiscoverableInitXhci (
)
{
MVHW_NONDISCOVERABLE_DESC *Desc = &mA7k8kNonDiscoverableDescTemplate;
@@ -63,7 +63,7 @@ PciEmulationInitXhci (
UINT8 i;
if (PcdGetSize (PcdPciEXhci) < Desc->XhciDevCount) {
- DEBUG((DEBUG_ERROR, "PciEmulation: Wrong PcdPciEXhci format\n"));
+ DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Wrong PcdPciEXhci format\n"));
return EFI_INVALID_PARAMETER;
}
@@ -82,7 +82,7 @@ PciEmulationInitXhci (
);
if (EFI_ERROR(Status)) {
- DEBUG((DEBUG_ERROR, "PciEmulation: Cannot install Xhci device %d\n", i));
+ DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Cannot install Xhci device %d\n", i));
return Status;
}
}
@@ -92,7 +92,7 @@ PciEmulationInitXhci (
STATIC
EFI_STATUS
-PciEmulationInitAhci (
+MvNonDiscoverableInitAhci (
)
{
MVHW_NONDISCOVERABLE_DESC *Desc = &mA7k8kNonDiscoverableDescTemplate;
@@ -100,7 +100,7 @@ PciEmulationInitAhci (
UINT8 i;
if (PcdGetSize (PcdPciEAhci) < Desc->AhciDevCount) {
- DEBUG((DEBUG_ERROR, "PciEmulation: Wrong PcdPciEAhci format\n"));
+ DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Wrong PcdPciEAhci format\n"));
return EFI_INVALID_PARAMETER;
}
@@ -119,7 +119,7 @@ PciEmulationInitAhci (
);
if (EFI_ERROR(Status)) {
- DEBUG((DEBUG_ERROR, "PciEmulation: Cannot install Ahci device %d\n", i));
+ DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Cannot install Ahci device %d\n", i));
return Status;
}
}
@@ -129,7 +129,7 @@ PciEmulationInitAhci (
STATIC
EFI_STATUS
-PciEmulationInitSdhci (
+MvNonDiscoverableInitSdhci (
)
{
MVHW_NONDISCOVERABLE_DESC *Desc = &mA7k8kNonDiscoverableDescTemplate;
@@ -137,7 +137,7 @@ PciEmulationInitSdhci (
UINT8 i;
if (PcdGetSize (PcdPciESdhci) < Desc->SdhciDevCount) {
- DEBUG((DEBUG_ERROR, "PciEmulation: Wrong PcdPciESdhci format\n"));
+ DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Wrong PcdPciESdhci format\n"));
return EFI_INVALID_PARAMETER;
}
@@ -156,7 +156,7 @@ PciEmulationInitSdhci (
);
if (EFI_ERROR(Status)) {
- DEBUG((DEBUG_ERROR, "PciEmulation: Cannot install Sdhci device %d\n", i));
+ DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Cannot install Sdhci device %d\n", i));
return Status;
}
}
@@ -169,24 +169,24 @@ PciEmulationInitSdhci (
//
EFI_STATUS
EFIAPI
-PciEmulationEntryPoint (
+MvNonDiscoverableEntryPoint (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
{
EFI_STATUS Status;
- Status = PciEmulationInitXhci();
+ Status = MvNonDiscoverableInitXhci();
if (EFI_ERROR(Status)) {
return Status;
}
- Status = PciEmulationInitAhci();
+ Status = MvNonDiscoverableInitAhci();
if (EFI_ERROR(Status)) {
return Status;
}
- Status = PciEmulationInitSdhci();
+ Status = MvNonDiscoverableInitSdhci();
if (EFI_ERROR(Status)) {
return Status;
}
diff --git a/Silicon/Marvell/PciEmulation/PciEmulation.inf b/Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf
similarity index 91%
rename from Silicon/Marvell/PciEmulation/PciEmulation.inf
rename to Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf
index c6a3c99..3f94c32 100644
--- a/Silicon/Marvell/PciEmulation/PciEmulation.inf
+++ b/Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf
@@ -32,15 +32,15 @@
[Defines]
INF_VERSION = 0x00010019
- BASE_NAME = PciEmulation
+ BASE_NAME = MvNonDiscoverableDxe
FILE_GUID = 3dfa08da-923b-4841-9435-c77a604d7493
MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0
- ENTRY_POINT = PciEmulationEntryPoint
+ ENTRY_POINT = MvNonDiscoverableEntryPoint
[Sources.common]
- PciEmulation.c
+ MvNonDiscoverableDxe.c
[Packages]
EmbeddedPkg/EmbeddedPkg.dec
@@ -53,9 +53,9 @@
UefiDriverEntryPoint
[Pcd]
- gMarvellTokenSpaceGuid.PcdPciEXhci
gMarvellTokenSpaceGuid.PcdPciEAhci
gMarvellTokenSpaceGuid.PcdPciESdhci
+ gMarvellTokenSpaceGuid.PcdPciEXhci
[Depex]
TRUE
--
2.7.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [platforms: PATCH v2 5/5] Marvell/Drivers: Drop 'PciEmulation' naming
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
0 siblings, 1 reply; 15+ messages in thread
From: Ard Biesheuvel @ 2017-12-07 19:49 UTC (permalink / raw)
To: Marcin Wojtas
Cc: edk2-devel@lists.01.org, Leif Lindholm, Nadav Haklai,
Neta Zur Hershkovits, Kostya Porotchkin, Hua Jing,
Jan Dąbroś, ka
Hi Marcin,
On 7 December 2017 at 19:20, Marcin Wojtas <mw@semihalf.com> wrote:
> 'PciEmulation' is not a proper naming for a driver, which
> uses NonDiscoverableDeviceRegistrationLib for handling
> the devices attached via internal bus of the SoC.
> Rename it to MvNonDiscoverableDxe and move under
> Silicon/Marvell/Drivers directory.
>
Thank you!
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
> Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf | 4 +--
> Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 4 +--
> Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} | 26 ++++++++++----------
> Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} | 8 +++---
> 4 files changed, 21 insertions(+), 21 deletions(-)
> rename Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} (84%)
> rename Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} (91%)
>
Could we please have
Drivers/MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf
instead?
> diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
> index 6d57b9a..2bf409e 100644
> --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
> +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
> @@ -135,8 +135,8 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
> INF Silicon/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf
> INF Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
>
> - # PciEmulation
> - INF Silicon/Marvell/PciEmulation/PciEmulation.inf
> + # NonDiscoverableDevices
> + INF Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf
> INF MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
>
> # SCSI
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> index 0eb3ef3..598810e 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> @@ -440,8 +440,8 @@
> EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
> EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
>
> - # PciEmulation
> - Silicon/Marvell/PciEmulation/PciEmulation.inf
> + # NonDiscoverableDevices
> + Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf
> MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
>
> # SCSI
> diff --git a/Silicon/Marvell/PciEmulation/PciEmulation.c b/Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c
> similarity index 84%
> rename from Silicon/Marvell/PciEmulation/PciEmulation.c
> rename to Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c
> index 35f1a87..abb2940 100644
> --- a/Silicon/Marvell/PciEmulation/PciEmulation.c
> +++ b/Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c
> @@ -55,7 +55,7 @@ STATIC UINT8 * CONST SdhciDeviceTable = FixedPcdGetPtr (PcdPciESdhci);
> //
> STATIC
> EFI_STATUS
> -PciEmulationInitXhci (
> +MvNonDiscoverableInitXhci (
> )
> {
> MVHW_NONDISCOVERABLE_DESC *Desc = &mA7k8kNonDiscoverableDescTemplate;
> @@ -63,7 +63,7 @@ PciEmulationInitXhci (
> UINT8 i;
>
> if (PcdGetSize (PcdPciEXhci) < Desc->XhciDevCount) {
> - DEBUG((DEBUG_ERROR, "PciEmulation: Wrong PcdPciEXhci format\n"));
> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Wrong PcdPciEXhci format\n"));
> return EFI_INVALID_PARAMETER;
> }
>
> @@ -82,7 +82,7 @@ PciEmulationInitXhci (
> );
>
> if (EFI_ERROR(Status)) {
> - DEBUG((DEBUG_ERROR, "PciEmulation: Cannot install Xhci device %d\n", i));
> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Cannot install Xhci device %d\n", i));
> return Status;
> }
> }
> @@ -92,7 +92,7 @@ PciEmulationInitXhci (
>
> STATIC
> EFI_STATUS
> -PciEmulationInitAhci (
> +MvNonDiscoverableInitAhci (
> )
> {
> MVHW_NONDISCOVERABLE_DESC *Desc = &mA7k8kNonDiscoverableDescTemplate;
> @@ -100,7 +100,7 @@ PciEmulationInitAhci (
> UINT8 i;
>
> if (PcdGetSize (PcdPciEAhci) < Desc->AhciDevCount) {
> - DEBUG((DEBUG_ERROR, "PciEmulation: Wrong PcdPciEAhci format\n"));
> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Wrong PcdPciEAhci format\n"));
> return EFI_INVALID_PARAMETER;
> }
>
> @@ -119,7 +119,7 @@ PciEmulationInitAhci (
> );
>
> if (EFI_ERROR(Status)) {
> - DEBUG((DEBUG_ERROR, "PciEmulation: Cannot install Ahci device %d\n", i));
> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Cannot install Ahci device %d\n", i));
> return Status;
> }
> }
> @@ -129,7 +129,7 @@ PciEmulationInitAhci (
>
> STATIC
> EFI_STATUS
> -PciEmulationInitSdhci (
> +MvNonDiscoverableInitSdhci (
> )
> {
> MVHW_NONDISCOVERABLE_DESC *Desc = &mA7k8kNonDiscoverableDescTemplate;
> @@ -137,7 +137,7 @@ PciEmulationInitSdhci (
> UINT8 i;
>
> if (PcdGetSize (PcdPciESdhci) < Desc->SdhciDevCount) {
> - DEBUG((DEBUG_ERROR, "PciEmulation: Wrong PcdPciESdhci format\n"));
> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Wrong PcdPciESdhci format\n"));
> return EFI_INVALID_PARAMETER;
> }
>
> @@ -156,7 +156,7 @@ PciEmulationInitSdhci (
> );
>
> if (EFI_ERROR(Status)) {
> - DEBUG((DEBUG_ERROR, "PciEmulation: Cannot install Sdhci device %d\n", i));
> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Cannot install Sdhci device %d\n", i));
> return Status;
> }
> }
> @@ -169,24 +169,24 @@ PciEmulationInitSdhci (
> //
> EFI_STATUS
> EFIAPI
> -PciEmulationEntryPoint (
> +MvNonDiscoverableEntryPoint (
> IN EFI_HANDLE ImageHandle,
> IN EFI_SYSTEM_TABLE *SystemTable
> )
> {
> EFI_STATUS Status;
>
> - Status = PciEmulationInitXhci();
> + Status = MvNonDiscoverableInitXhci();
> if (EFI_ERROR(Status)) {
> return Status;
> }
>
> - Status = PciEmulationInitAhci();
> + Status = MvNonDiscoverableInitAhci();
> if (EFI_ERROR(Status)) {
> return Status;
> }
>
> - Status = PciEmulationInitSdhci();
> + Status = MvNonDiscoverableInitSdhci();
> if (EFI_ERROR(Status)) {
> return Status;
> }
> diff --git a/Silicon/Marvell/PciEmulation/PciEmulation.inf b/Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf
> similarity index 91%
> rename from Silicon/Marvell/PciEmulation/PciEmulation.inf
> rename to Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf
> index c6a3c99..3f94c32 100644
> --- a/Silicon/Marvell/PciEmulation/PciEmulation.inf
> +++ b/Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf
> @@ -32,15 +32,15 @@
>
> [Defines]
> INF_VERSION = 0x00010019
> - BASE_NAME = PciEmulation
> + BASE_NAME = MvNonDiscoverableDxe
> FILE_GUID = 3dfa08da-923b-4841-9435-c77a604d7493
> MODULE_TYPE = DXE_DRIVER
> VERSION_STRING = 1.0
>
> - ENTRY_POINT = PciEmulationEntryPoint
> + ENTRY_POINT = MvNonDiscoverableEntryPoint
>
> [Sources.common]
> - PciEmulation.c
> + MvNonDiscoverableDxe.c
>
> [Packages]
> EmbeddedPkg/EmbeddedPkg.dec
> @@ -53,9 +53,9 @@
> UefiDriverEntryPoint
>
> [Pcd]
> - gMarvellTokenSpaceGuid.PcdPciEXhci
> gMarvellTokenSpaceGuid.PcdPciEAhci
> gMarvellTokenSpaceGuid.PcdPciESdhci
> + gMarvellTokenSpaceGuid.PcdPciEXhci
>
> [Depex]
> TRUE
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [platforms: PATCH v2 5/5] Marvell/Drivers: Drop 'PciEmulation' naming
2017-12-07 19:49 ` Ard Biesheuvel
@ 2017-12-07 23:08 ` Marcin Wojtas
2017-12-08 8:40 ` Ard Biesheuvel
0 siblings, 1 reply; 15+ messages in thread
From: Marcin Wojtas @ 2017-12-07 23:08 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: edk2-devel@lists.01.org, Leif Lindholm, Nadav Haklai,
Neta Zur Hershkovits, Kostya Porotchkin, Hua Jing,
Jan Dąbroś, Konrad Adamczyk
Hi Ard,
2017-12-07 20:49 GMT+01:00 Ard Biesheuvel <ard.biesheuvel@linaro.org>:
> Hi Marcin,
>
> On 7 December 2017 at 19:20, Marcin Wojtas <mw@semihalf.com> wrote:
>> 'PciEmulation' is not a proper naming for a driver, which
>> uses NonDiscoverableDeviceRegistrationLib for handling
>> the devices attached via internal bus of the SoC.
>> Rename it to MvNonDiscoverableDxe and move under
>> Silicon/Marvell/Drivers directory.
>>
>
> Thank you!
>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>> ---
>> Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf | 4 +--
>> Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 4 +--
>> Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} | 26 ++++++++++----------
>> Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} | 8 +++---
>> 4 files changed, 21 insertions(+), 21 deletions(-)
>> rename Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} (84%)
>> rename Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} (91%)
>>
>
> Could we please have
>
> Drivers/MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf
>
> instead?
>
My intention was to keep a generic naming at the first level inside
the Silicon/Drivers/Marvell:
I2c Net SdMmc Spi
I can change it in a way you want, but to my taste
MvNonDiscoverableDxe doesn't fully fit the company above. Do you see
any possible compromise? :)
Best regards,
Marcin
>
>
>
>> diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
>> index 6d57b9a..2bf409e 100644
>> --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
>> +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
>> @@ -135,8 +135,8 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
>> INF Silicon/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf
>> INF Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
>>
>> - # PciEmulation
>> - INF Silicon/Marvell/PciEmulation/PciEmulation.inf
>> + # NonDiscoverableDevices
>> + INF Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf
>> INF MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
>>
>> # SCSI
>> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>> index 0eb3ef3..598810e 100644
>> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>> @@ -440,8 +440,8 @@
>> EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
>> EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
>>
>> - # PciEmulation
>> - Silicon/Marvell/PciEmulation/PciEmulation.inf
>> + # NonDiscoverableDevices
>> + Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf
>> MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
>>
>> # SCSI
>> diff --git a/Silicon/Marvell/PciEmulation/PciEmulation.c b/Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c
>> similarity index 84%
>> rename from Silicon/Marvell/PciEmulation/PciEmulation.c
>> rename to Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c
>> index 35f1a87..abb2940 100644
>> --- a/Silicon/Marvell/PciEmulation/PciEmulation.c
>> +++ b/Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c
>> @@ -55,7 +55,7 @@ STATIC UINT8 * CONST SdhciDeviceTable = FixedPcdGetPtr (PcdPciESdhci);
>> //
>> STATIC
>> EFI_STATUS
>> -PciEmulationInitXhci (
>> +MvNonDiscoverableInitXhci (
>> )
>> {
>> MVHW_NONDISCOVERABLE_DESC *Desc = &mA7k8kNonDiscoverableDescTemplate;
>> @@ -63,7 +63,7 @@ PciEmulationInitXhci (
>> UINT8 i;
>>
>> if (PcdGetSize (PcdPciEXhci) < Desc->XhciDevCount) {
>> - DEBUG((DEBUG_ERROR, "PciEmulation: Wrong PcdPciEXhci format\n"));
>> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Wrong PcdPciEXhci format\n"));
>> return EFI_INVALID_PARAMETER;
>> }
>>
>> @@ -82,7 +82,7 @@ PciEmulationInitXhci (
>> );
>>
>> if (EFI_ERROR(Status)) {
>> - DEBUG((DEBUG_ERROR, "PciEmulation: Cannot install Xhci device %d\n", i));
>> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Cannot install Xhci device %d\n", i));
>> return Status;
>> }
>> }
>> @@ -92,7 +92,7 @@ PciEmulationInitXhci (
>>
>> STATIC
>> EFI_STATUS
>> -PciEmulationInitAhci (
>> +MvNonDiscoverableInitAhci (
>> )
>> {
>> MVHW_NONDISCOVERABLE_DESC *Desc = &mA7k8kNonDiscoverableDescTemplate;
>> @@ -100,7 +100,7 @@ PciEmulationInitAhci (
>> UINT8 i;
>>
>> if (PcdGetSize (PcdPciEAhci) < Desc->AhciDevCount) {
>> - DEBUG((DEBUG_ERROR, "PciEmulation: Wrong PcdPciEAhci format\n"));
>> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Wrong PcdPciEAhci format\n"));
>> return EFI_INVALID_PARAMETER;
>> }
>>
>> @@ -119,7 +119,7 @@ PciEmulationInitAhci (
>> );
>>
>> if (EFI_ERROR(Status)) {
>> - DEBUG((DEBUG_ERROR, "PciEmulation: Cannot install Ahci device %d\n", i));
>> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Cannot install Ahci device %d\n", i));
>> return Status;
>> }
>> }
>> @@ -129,7 +129,7 @@ PciEmulationInitAhci (
>>
>> STATIC
>> EFI_STATUS
>> -PciEmulationInitSdhci (
>> +MvNonDiscoverableInitSdhci (
>> )
>> {
>> MVHW_NONDISCOVERABLE_DESC *Desc = &mA7k8kNonDiscoverableDescTemplate;
>> @@ -137,7 +137,7 @@ PciEmulationInitSdhci (
>> UINT8 i;
>>
>> if (PcdGetSize (PcdPciESdhci) < Desc->SdhciDevCount) {
>> - DEBUG((DEBUG_ERROR, "PciEmulation: Wrong PcdPciESdhci format\n"));
>> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Wrong PcdPciESdhci format\n"));
>> return EFI_INVALID_PARAMETER;
>> }
>>
>> @@ -156,7 +156,7 @@ PciEmulationInitSdhci (
>> );
>>
>> if (EFI_ERROR(Status)) {
>> - DEBUG((DEBUG_ERROR, "PciEmulation: Cannot install Sdhci device %d\n", i));
>> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Cannot install Sdhci device %d\n", i));
>> return Status;
>> }
>> }
>> @@ -169,24 +169,24 @@ PciEmulationInitSdhci (
>> //
>> EFI_STATUS
>> EFIAPI
>> -PciEmulationEntryPoint (
>> +MvNonDiscoverableEntryPoint (
>> IN EFI_HANDLE ImageHandle,
>> IN EFI_SYSTEM_TABLE *SystemTable
>> )
>> {
>> EFI_STATUS Status;
>>
>> - Status = PciEmulationInitXhci();
>> + Status = MvNonDiscoverableInitXhci();
>> if (EFI_ERROR(Status)) {
>> return Status;
>> }
>>
>> - Status = PciEmulationInitAhci();
>> + Status = MvNonDiscoverableInitAhci();
>> if (EFI_ERROR(Status)) {
>> return Status;
>> }
>>
>> - Status = PciEmulationInitSdhci();
>> + Status = MvNonDiscoverableInitSdhci();
>> if (EFI_ERROR(Status)) {
>> return Status;
>> }
>> diff --git a/Silicon/Marvell/PciEmulation/PciEmulation.inf b/Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf
>> similarity index 91%
>> rename from Silicon/Marvell/PciEmulation/PciEmulation.inf
>> rename to Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf
>> index c6a3c99..3f94c32 100644
>> --- a/Silicon/Marvell/PciEmulation/PciEmulation.inf
>> +++ b/Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf
>> @@ -32,15 +32,15 @@
>>
>> [Defines]
>> INF_VERSION = 0x00010019
>> - BASE_NAME = PciEmulation
>> + BASE_NAME = MvNonDiscoverableDxe
>> FILE_GUID = 3dfa08da-923b-4841-9435-c77a604d7493
>> MODULE_TYPE = DXE_DRIVER
>> VERSION_STRING = 1.0
>>
>> - ENTRY_POINT = PciEmulationEntryPoint
>> + ENTRY_POINT = MvNonDiscoverableEntryPoint
>>
>> [Sources.common]
>> - PciEmulation.c
>> + MvNonDiscoverableDxe.c
>>
>> [Packages]
>> EmbeddedPkg/EmbeddedPkg.dec
>> @@ -53,9 +53,9 @@
>> UefiDriverEntryPoint
>>
>> [Pcd]
>> - gMarvellTokenSpaceGuid.PcdPciEXhci
>> gMarvellTokenSpaceGuid.PcdPciEAhci
>> gMarvellTokenSpaceGuid.PcdPciESdhci
>> + gMarvellTokenSpaceGuid.PcdPciEXhci
>>
>> [Depex]
>> TRUE
>> --
>> 2.7.4
>>
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [platforms: PATCH v2 5/5] Marvell/Drivers: Drop 'PciEmulation' naming
2017-12-07 23:08 ` Marcin Wojtas
@ 2017-12-08 8:40 ` Ard Biesheuvel
2017-12-08 12:11 ` Marcin Wojtas
0 siblings, 1 reply; 15+ messages in thread
From: Ard Biesheuvel @ 2017-12-08 8:40 UTC (permalink / raw)
To: Marcin Wojtas
Cc: edk2-devel@lists.01.org, Leif Lindholm, Nadav Haklai,
Neta Zur Hershkovits, Kostya Porotchkin, Hua Jing,
Jan Dąbroś, Konrad Adamczyk
On 7 December 2017 at 23:08, Marcin Wojtas <mw@semihalf.com> wrote:
> Hi Ard,
>
> 2017-12-07 20:49 GMT+01:00 Ard Biesheuvel <ard.biesheuvel@linaro.org>:
>> Hi Marcin,
>>
>> On 7 December 2017 at 19:20, Marcin Wojtas <mw@semihalf.com> wrote:
>>> 'PciEmulation' is not a proper naming for a driver, which
>>> uses NonDiscoverableDeviceRegistrationLib for handling
>>> the devices attached via internal bus of the SoC.
>>> Rename it to MvNonDiscoverableDxe and move under
>>> Silicon/Marvell/Drivers directory.
>>>
>>
>> Thank you!
>>
>>> Contributed-under: TianoCore Contribution Agreement 1.1
>>> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>>> ---
>>> Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf | 4 +--
>>> Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 4 +--
>>> Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} | 26 ++++++++++----------
>>> Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} | 8 +++---
>>> 4 files changed, 21 insertions(+), 21 deletions(-)
>>> rename Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} (84%)
>>> rename Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} (91%)
>>>
>>
>> Could we please have
>>
>> Drivers/MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf
>>
>> instead?
>>
>
> My intention was to keep a generic naming at the first level inside
> the Silicon/Drivers/Marvell:
> I2c Net SdMmc Spi
>
> I can change it in a way you want, but to my taste
> MvNonDiscoverableDxe doesn't fully fit the company above. Do you see
> any possible compromise? :)
>
Well, if you want 'generic' at the level below
Silicon/Drivers/Marvell, you will still need
MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf below that.
So
Drivers/NonDiscoverable/MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf
perhaps?
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [platforms: PATCH v2 5/5] Marvell/Drivers: Drop 'PciEmulation' naming
2017-12-08 8:40 ` Ard Biesheuvel
@ 2017-12-08 12:11 ` Marcin Wojtas
2017-12-08 14:08 ` Leif Lindholm
0 siblings, 1 reply; 15+ messages in thread
From: Marcin Wojtas @ 2017-12-08 12:11 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: edk2-devel@lists.01.org, Leif Lindholm, Nadav Haklai,
Neta Zur Hershkovits, Kostya Porotchkin, Hua Jing,
Jan Dąbroś, Konrad Adamczyk
2017-12-08 9:40 GMT+01:00 Ard Biesheuvel <ard.biesheuvel@linaro.org>:
> On 7 December 2017 at 23:08, Marcin Wojtas <mw@semihalf.com> wrote:
>> Hi Ard,
>>
>> 2017-12-07 20:49 GMT+01:00 Ard Biesheuvel <ard.biesheuvel@linaro.org>:
>>> Hi Marcin,
>>>
>>> On 7 December 2017 at 19:20, Marcin Wojtas <mw@semihalf.com> wrote:
>>>> 'PciEmulation' is not a proper naming for a driver, which
>>>> uses NonDiscoverableDeviceRegistrationLib for handling
>>>> the devices attached via internal bus of the SoC.
>>>> Rename it to MvNonDiscoverableDxe and move under
>>>> Silicon/Marvell/Drivers directory.
>>>>
>>>
>>> Thank you!
>>>
>>>> Contributed-under: TianoCore Contribution Agreement 1.1
>>>> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>>>> ---
>>>> Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf | 4 +--
>>>> Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 4 +--
>>>> Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} | 26 ++++++++++----------
>>>> Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} | 8 +++---
>>>> 4 files changed, 21 insertions(+), 21 deletions(-)
>>>> rename Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} (84%)
>>>> rename Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} (91%)
>>>>
>>>
>>> Could we please have
>>>
>>> Drivers/MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf
>>>
>>> instead?
>>>
>>
>> My intention was to keep a generic naming at the first level inside
>> the Silicon/Drivers/Marvell:
>> I2c Net SdMmc Spi
>>
>> I can change it in a way you want, but to my taste
>> MvNonDiscoverableDxe doesn't fully fit the company above. Do you see
>> any possible compromise? :)
>>
>
> Well, if you want 'generic' at the level below
> Silicon/Drivers/Marvell, you will still need
> MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf below that.
>
> So
>
> Drivers/NonDiscoverable/MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf
>
> perhaps?
This is ok to me.
Thanks,
Marcin
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [platforms: PATCH v2 5/5] Marvell/Drivers: Drop 'PciEmulation' naming
2017-12-08 12:11 ` Marcin Wojtas
@ 2017-12-08 14:08 ` Leif Lindholm
2017-12-08 14:13 ` Marcin Wojtas
0 siblings, 1 reply; 15+ messages in thread
From: Leif Lindholm @ 2017-12-08 14:08 UTC (permalink / raw)
To: Marcin Wojtas
Cc: Ard Biesheuvel, edk2-devel@lists.01.org, Nadav Haklai,
Neta Zur Hershkovits, Kostya Porotchkin, Hua Jing,
Jan Dąbroś, Konrad Adamczyk
On Fri, Dec 08, 2017 at 01:11:27PM +0100, Marcin Wojtas wrote:
> 2017-12-08 9:40 GMT+01:00 Ard Biesheuvel <ard.biesheuvel@linaro.org>:
> > On 7 December 2017 at 23:08, Marcin Wojtas <mw@semihalf.com> wrote:
> >> Hi Ard,
> >>
> >> 2017-12-07 20:49 GMT+01:00 Ard Biesheuvel <ard.biesheuvel@linaro.org>:
> >>> Hi Marcin,
> >>>
> >>> On 7 December 2017 at 19:20, Marcin Wojtas <mw@semihalf.com> wrote:
> >>>> 'PciEmulation' is not a proper naming for a driver, which
> >>>> uses NonDiscoverableDeviceRegistrationLib for handling
> >>>> the devices attached via internal bus of the SoC.
> >>>> Rename it to MvNonDiscoverableDxe and move under
> >>>> Silicon/Marvell/Drivers directory.
> >>>>
> >>>
> >>> Thank you!
> >>>
> >>>> Contributed-under: TianoCore Contribution Agreement 1.1
> >>>> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> >>>> ---
> >>>> Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf | 4 +--
> >>>> Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 4 +--
> >>>> Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} | 26 ++++++++++----------
> >>>> Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} | 8 +++---
> >>>> 4 files changed, 21 insertions(+), 21 deletions(-)
> >>>> rename Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} (84%)
> >>>> rename Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} (91%)
> >>>>
> >>>
> >>> Could we please have
> >>>
> >>> Drivers/MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf
> >>>
> >>> instead?
> >>>
> >>
> >> My intention was to keep a generic naming at the first level inside
> >> the Silicon/Drivers/Marvell:
> >> I2c Net SdMmc Spi
> >>
> >> I can change it in a way you want, but to my taste
> >> MvNonDiscoverableDxe doesn't fully fit the company above. Do you see
> >> any possible compromise? :)
> >>
> >
> > Well, if you want 'generic' at the level below
> > Silicon/Drivers/Marvell, you will still need
> > MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf below that.
> >
> > So
> >
> > Drivers/NonDiscoverable/MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf
> >
> > perhaps?
>
> This is ok to me.
As we're bikeshedding...
What would be the benefit of the above?
I could get Drivers/NonDiscoverable/780xxNonDiscoverableDxe, but
surely if you're preparing for Armada 37xx (which I would be very
happy to see), having something called MvNonDiscoverableDxe is not
going to be very identifying.
I don't mind a few extra levels of directories in order to clear up
usage, but we do need to actually make use of it then.
/
Leif
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [platforms: PATCH v2 5/5] Marvell/Drivers: Drop 'PciEmulation' naming
2017-12-08 14:08 ` Leif Lindholm
@ 2017-12-08 14:13 ` Marcin Wojtas
2017-12-08 14:23 ` Leif Lindholm
0 siblings, 1 reply; 15+ messages in thread
From: Marcin Wojtas @ 2017-12-08 14:13 UTC (permalink / raw)
To: Leif Lindholm
Cc: Ard Biesheuvel, edk2-devel@lists.01.org, Nadav Haklai,
Neta Zur Hershkovits, Kostya Porotchkin, Hua Jing,
Jan Dąbroś, Konrad Adamczyk
Hi Leif,
2017-12-08 15:08 GMT+01:00 Leif Lindholm <leif.lindholm@linaro.org>:
> On Fri, Dec 08, 2017 at 01:11:27PM +0100, Marcin Wojtas wrote:
>> 2017-12-08 9:40 GMT+01:00 Ard Biesheuvel <ard.biesheuvel@linaro.org>:
>> > On 7 December 2017 at 23:08, Marcin Wojtas <mw@semihalf.com> wrote:
>> >> Hi Ard,
>> >>
>> >> 2017-12-07 20:49 GMT+01:00 Ard Biesheuvel <ard.biesheuvel@linaro.org>:
>> >>> Hi Marcin,
>> >>>
>> >>> On 7 December 2017 at 19:20, Marcin Wojtas <mw@semihalf.com> wrote:
>> >>>> 'PciEmulation' is not a proper naming for a driver, which
>> >>>> uses NonDiscoverableDeviceRegistrationLib for handling
>> >>>> the devices attached via internal bus of the SoC.
>> >>>> Rename it to MvNonDiscoverableDxe and move under
>> >>>> Silicon/Marvell/Drivers directory.
>> >>>>
>> >>>
>> >>> Thank you!
>> >>>
>> >>>> Contributed-under: TianoCore Contribution Agreement 1.1
>> >>>> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>> >>>> ---
>> >>>> Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf | 4 +--
>> >>>> Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 4 +--
>> >>>> Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} | 26 ++++++++++----------
>> >>>> Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} | 8 +++---
>> >>>> 4 files changed, 21 insertions(+), 21 deletions(-)
>> >>>> rename Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} (84%)
>> >>>> rename Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} (91%)
>> >>>>
>> >>>
>> >>> Could we please have
>> >>>
>> >>> Drivers/MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf
>> >>>
>> >>> instead?
>> >>>
>> >>
>> >> My intention was to keep a generic naming at the first level inside
>> >> the Silicon/Drivers/Marvell:
>> >> I2c Net SdMmc Spi
>> >>
>> >> I can change it in a way you want, but to my taste
>> >> MvNonDiscoverableDxe doesn't fully fit the company above. Do you see
>> >> any possible compromise? :)
>> >>
>> >
>> > Well, if you want 'generic' at the level below
>> > Silicon/Drivers/Marvell, you will still need
>> > MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf below that.
>> >
>> > So
>> >
>> > Drivers/NonDiscoverable/MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf
>> >
>> > perhaps?
>>
>> This is ok to me.
>
> As we're bikeshedding...
>
> What would be the benefit of the above?
>
> I could get Drivers/NonDiscoverable/780xxNonDiscoverableDxe, but
> surely if you're preparing for Armada 37xx (which I would be very
> happy to see), having something called MvNonDiscoverableDxe is not
> going to be very identifying.
Well, I think we will most likely reuse this driver as is - on A37xx there is
generic AHCI/XHCI and even same Xenon driver. So, are you fine with
what I initially added in this patch
(Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c, etc.),
or you wish to use Drivers/MvNonDiscoverableDxe/MvNonDiscoverableDxe.c, etc?
Best regards,
Marcin
>
> I don't mind a few extra levels of directories in order to clear up
> usage, but we do need to actually make use of it then.
>
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [platforms: PATCH v2 5/5] Marvell/Drivers: Drop 'PciEmulation' naming
2017-12-08 14:13 ` Marcin Wojtas
@ 2017-12-08 14:23 ` Leif Lindholm
0 siblings, 0 replies; 15+ messages in thread
From: Leif Lindholm @ 2017-12-08 14:23 UTC (permalink / raw)
To: Marcin Wojtas
Cc: Ard Biesheuvel, edk2-devel@lists.01.org, Nadav Haklai,
Neta Zur Hershkovits, Kostya Porotchkin, Hua Jing,
Jan Dąbroś, Konrad Adamczyk
On Fri, Dec 08, 2017 at 03:13:54PM +0100, Marcin Wojtas wrote:
> Hi Leif,
>
> 2017-12-08 15:08 GMT+01:00 Leif Lindholm <leif.lindholm@linaro.org>:
> > On Fri, Dec 08, 2017 at 01:11:27PM +0100, Marcin Wojtas wrote:
> >> 2017-12-08 9:40 GMT+01:00 Ard Biesheuvel <ard.biesheuvel@linaro.org>:
> >> > On 7 December 2017 at 23:08, Marcin Wojtas <mw@semihalf.com> wrote:
> >> >> Hi Ard,
> >> >>
> >> >> 2017-12-07 20:49 GMT+01:00 Ard Biesheuvel <ard.biesheuvel@linaro.org>:
> >> >>> Hi Marcin,
> >> >>>
> >> >>> On 7 December 2017 at 19:20, Marcin Wojtas <mw@semihalf.com> wrote:
> >> >>>> 'PciEmulation' is not a proper naming for a driver, which
> >> >>>> uses NonDiscoverableDeviceRegistrationLib for handling
> >> >>>> the devices attached via internal bus of the SoC.
> >> >>>> Rename it to MvNonDiscoverableDxe and move under
> >> >>>> Silicon/Marvell/Drivers directory.
> >> >>>>
> >> >>>
> >> >>> Thank you!
> >> >>>
> >> >>>> Contributed-under: TianoCore Contribution Agreement 1.1
> >> >>>> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> >> >>>> ---
> >> >>>> Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf | 4 +--
> >> >>>> Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 4 +--
> >> >>>> Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} | 26 ++++++++++----------
> >> >>>> Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} | 8 +++---
> >> >>>> 4 files changed, 21 insertions(+), 21 deletions(-)
> >> >>>> rename Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} (84%)
> >> >>>> rename Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} (91%)
> >> >>>>
> >> >>>
> >> >>> Could we please have
> >> >>>
> >> >>> Drivers/MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf
> >> >>>
> >> >>> instead?
> >> >>>
> >> >>
> >> >> My intention was to keep a generic naming at the first level inside
> >> >> the Silicon/Drivers/Marvell:
> >> >> I2c Net SdMmc Spi
> >> >>
> >> >> I can change it in a way you want, but to my taste
> >> >> MvNonDiscoverableDxe doesn't fully fit the company above. Do you see
> >> >> any possible compromise? :)
> >> >>
> >> >
> >> > Well, if you want 'generic' at the level below
> >> > Silicon/Drivers/Marvell, you will still need
> >> > MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf below that.
> >> >
> >> > So
> >> >
> >> > Drivers/NonDiscoverable/MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf
> >> >
> >> > perhaps?
> >>
> >> This is ok to me.
> >
> > As we're bikeshedding...
> >
> > What would be the benefit of the above?
> >
> > I could get Drivers/NonDiscoverable/780xxNonDiscoverableDxe, but
> > surely if you're preparing for Armada 37xx (which I would be very
> > happy to see), having something called MvNonDiscoverableDxe is not
> > going to be very identifying.
>
> Well, I think we will most likely reuse this driver as is - on A37xx there is
> generic AHCI/XHCI and even same Xenon driver. So, are you fine with
> what I initially added in this patch
> (Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c, etc.),
> or you wish to use Drivers/MvNonDiscoverableDxe/MvNonDiscoverableDxe.c, etc?
I'm more on the Drivers/MvNonDiscoverableDxe/MvNonDiscoverableDxe.c
side of the fence in that case. NonDiscoverableDevices suggests there
will be multiple.
(That said, there is no need for the Mv prefix if it's under a Marvell
directory.)
Regards,
Leif
^ permalink raw reply [flat|nested] 15+ messages in thread