[edk2-devel] [edk2-platforms PATCH v1 0/4] Marvell package restructure

Narinder Dhillon posted 4 patches 6 months, 3 weeks ago
Failed in applying to current master (apply log)
.../Marvell/Armada70x0Db/Armada70x0Db.dsc     | 108 ++++-----
.../Armada70x0DbBoardDescLib.inf              |   2 +-
.../NonDiscoverableInitLib.inf                |   2 +-
.../Marvell/Armada80x0Db/Armada80x0Db.dsc     | 133 ++++++-----
.../Armada80x0DbBoardDescLib.inf              |   2 +-
.../NonDiscoverableInitLib.inf                |   2 +-
.../Cn9130DbABoardDescLib.inf                 |   2 +-
.../Cn9132DbABoardDescLib.inf                 |   2 +-
Platform/Marvell/Cn913xDb/Cn9130DbA.dsc.inc   | 100 ++++-----
Platform/Marvell/Cn913xDb/Cn9131DbA.dsc.inc   |  66 +++---
Platform/Marvell/Cn913xDb/Cn9132DbA.dsc.inc   |  66 +++---
Platform/Marvell/Cn913xDb/Cn913xDbA.dsc       |   8 +-
.../NonDiscoverableInitLib.inf                |   2 +-
.../Armada80x0McBin/Armada80x0McBin.dsc       | 116 +++++-----
.../Armada80x0McBinBoardDescLib.inf           |   2 +-
.../NonDiscoverableInitLib.inf                |   2 +-
.../BoardDescriptionLib.inf                   |   2 +-
.../Cn913xCEx7Eval/Cn9130Eval.dsc.inc         |  40 ++--
.../Cn913xCEx7Eval/Cn9131Eval.dsc.inc         |  56 ++---
.../Cn913xCEx7Eval/Cn9132Eval.dsc.inc         |  56 ++---
.../Cn913xCEx7Eval/Cn913xCEx7.dsc.inc         |  60 ++---
.../Cn913xCEx7Eval/Cn913xCEx7Eval.dsc         |   6 +-
.../NonDiscoverableInitLib.inf                |   2 +-
.../Applications/EepromCmd/EepromCmd.inf      |   2 +-
.../Applications/FirmwareUpdate/FUpdate.inf   |   6 +-
.../Applications/SpiTool/SpiFlashCmd.inf      |   6 +-
.../Armada7k8k/AcpiTables/Armada70x0Db.inf    |   2 +-
.../Armada7k8k/AcpiTables/Armada80x0Db.inf    |   2 +-
.../Armada7k8k/AcpiTables/Armada80x0McBin.inf |   2 +-
Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc |  22 +-
.../Armada7k8kRngDxe/Armada7k8kRngDxe.inf     |   4 +-
.../Drivers/PlatInitDxe/PlatInitDxe.inf       |   6 +-
.../PlatformFlashAccessLib.inf                |   6 +-
.../Library/Armada7k8kLib/Armada7k8kLib.inf   |   4 +-
.../Armada7k8kMemoryInitPeiLib.inf            |  14 +-
.../PciHostBridgeLib.inf                      |   2 +-
.../Armada7k8kPciSegmentLib/PciSegmentLib.inf |   2 +-
.../Armada7k8kSampleAtResetLib.inf            |   2 +-
.../Armada7k8kSoCDescLib.inf                  |   4 +-
.../RealTimeClockLib/RealTimeClockLib.inf     |   4 +-
.../Marvell/Documentation/PortingGuide.txt    | 114 +++++-----
.../Drivers/BoardDesc/MvBoardDescDxe.inf      |  18 +-
.../Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf      |   2 +-
.../Gpio/MvPca95xxDxe/MvPca95xxDxe.inf        |   2 +-
.../Drivers/I2c/MvEepromDxe/MvEepromDxe.inf   |   6 +-
.../Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf |  14 +-
.../Drivers/Net/MvMdioDxe/MvMdioDxe.inf       |   2 +-
.../Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.inf |  12 +-
Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf |  16 +-
.../NonDiscoverableDxe/NonDiscoverableDxe.inf |   2 +-
.../Drivers/SdMmc/XenonDxe/XenonDxe.inf       |   2 +-
.../SmbiosPlatformDxe/SmbiosPlatformDxe.inf   |  14 +-
.../Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.inf |   8 +-
.../Spi/MvSpiFlashDxe/MvSpiFlashDxe.inf       |   2 +-
.../Spi/MvSpiOrionDxe/MvSpiOrionDxe.inf       |   8 +-
.../Marvell/Library/ComPhyLib/ComPhyLib.inf   |  28 +--
Silicon/Marvell/Library/IcuLib/IcuLib.inf     |   4 +-
Silicon/Marvell/Library/MppLib/MppLib.inf     |  94 ++++----
.../Marvell/Library/MvGpioLib/MvGpioLib.inf   |   2 +-
.../Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf |   2 +-
Silicon/Marvell/Marvell.dec                   | 208 -----------------
.../Include/IndustryStandard/MvSmc.h          |   0
.../Include/Library/ArmadaBoardDescLib.h      |   0
.../Include/Library/ArmadaIcuLib.h            |   0
.../Include/Library/ArmadaSoCDescLib.h        |   0
.../Include/Library/MppLib.h                  |   0
.../Include/Library/MvComPhyLib.h             |   0
.../Include/Library/MvGpioLib.h               |   0
.../Include/Library/NonDiscoverableInitLib.h  |   0
.../Include/Library/SampleAtResetLib.h        |   0
.../Include/Library/UtmiPhyLib.h              |   0
.../Include/Protocol/BoardDesc.h              |   0
.../Include/Protocol/Eeprom.h                 |   0
.../Include/Protocol/Mdio.h                   |   0
.../Include/Protocol/MvI2c.h                  |   0
.../Include/Protocol/MvPhy.h                  |   0
.../Include/Protocol/Spi.h                    |   0
.../Include/Protocol/SpiFlash.h               |   0
.../MarvellSiliconPkg/MarvellSiliconPkg.dec   | 211 ++++++++++++++++++
.../OcteonTx/AcpiTables/T91/Cn9130DbA.inf     |   2 +-
.../OcteonTx/AcpiTables/T91/Cn9131DbA.inf     |   2 +-
.../AcpiTables/T91/Cn913xCEx7Eval.inf         |   2 +-
82 files changed, 852 insertions(+), 852 deletions(-)
delete mode 100644 Silicon/Marvell/Marvell.dec
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/IndustryStandard/MvSmc.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/ArmadaBoardDescLib.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/ArmadaIcuLib.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/ArmadaSoCDescLib.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MppLib.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MvComPhyLib.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MvGpioLib.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/NonDiscoverableInitLib.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/SampleAtResetLib.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/UtmiPhyLib.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/BoardDesc.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Eeprom.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Mdio.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/MvI2c.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/MvPhy.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Spi.h (100%)
rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/SpiFlash.h (100%)
create mode 100644 Silicon/Marvell/MarvellSiliconPkg/MarvellSiliconPkg.dec
[edk2-devel] [edk2-platforms PATCH v1 0/4] Marvell package restructure
Posted by Narinder Dhillon 6 months, 3 weeks ago
From: Narinder Dhillon <ndhillon@marvell.com>

Current Silicon/Marvell package structure does not allow sharing of
components that are common to different SoC's. This restructure will
increase shared code and better seperation.

Credit to Leif Lindholm for providing this new structure.

Narinder Dhillon (4):
  Silicon/Marvell: Retructure package
  Silicon/Marvell: Use new package name and path
  Platform/Marvell: Use new package name and path
  Platform/SolidRun: Use new package name and path

 .../Marvell/Armada70x0Db/Armada70x0Db.dsc     | 108 ++++-----
 .../Armada70x0DbBoardDescLib.inf              |   2 +-
 .../NonDiscoverableInitLib.inf                |   2 +-
 .../Marvell/Armada80x0Db/Armada80x0Db.dsc     | 133 ++++++-----
 .../Armada80x0DbBoardDescLib.inf              |   2 +-
 .../NonDiscoverableInitLib.inf                |   2 +-
 .../Cn9130DbABoardDescLib.inf                 |   2 +-
 .../Cn9132DbABoardDescLib.inf                 |   2 +-
 Platform/Marvell/Cn913xDb/Cn9130DbA.dsc.inc   | 100 ++++-----
 Platform/Marvell/Cn913xDb/Cn9131DbA.dsc.inc   |  66 +++---
 Platform/Marvell/Cn913xDb/Cn9132DbA.dsc.inc   |  66 +++---
 Platform/Marvell/Cn913xDb/Cn913xDbA.dsc       |   8 +-
 .../NonDiscoverableInitLib.inf                |   2 +-
 .../Armada80x0McBin/Armada80x0McBin.dsc       | 116 +++++-----
 .../Armada80x0McBinBoardDescLib.inf           |   2 +-
 .../NonDiscoverableInitLib.inf                |   2 +-
 .../BoardDescriptionLib.inf                   |   2 +-
 .../Cn913xCEx7Eval/Cn9130Eval.dsc.inc         |  40 ++--
 .../Cn913xCEx7Eval/Cn9131Eval.dsc.inc         |  56 ++---
 .../Cn913xCEx7Eval/Cn9132Eval.dsc.inc         |  56 ++---
 .../Cn913xCEx7Eval/Cn913xCEx7.dsc.inc         |  60 ++---
 .../Cn913xCEx7Eval/Cn913xCEx7Eval.dsc         |   6 +-
 .../NonDiscoverableInitLib.inf                |   2 +-
 .../Applications/EepromCmd/EepromCmd.inf      |   2 +-
 .../Applications/FirmwareUpdate/FUpdate.inf   |   6 +-
 .../Applications/SpiTool/SpiFlashCmd.inf      |   6 +-
 .../Armada7k8k/AcpiTables/Armada70x0Db.inf    |   2 +-
 .../Armada7k8k/AcpiTables/Armada80x0Db.inf    |   2 +-
 .../Armada7k8k/AcpiTables/Armada80x0McBin.inf |   2 +-
 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc |  22 +-
 .../Armada7k8kRngDxe/Armada7k8kRngDxe.inf     |   4 +-
 .../Drivers/PlatInitDxe/PlatInitDxe.inf       |   6 +-
 .../PlatformFlashAccessLib.inf                |   6 +-
 .../Library/Armada7k8kLib/Armada7k8kLib.inf   |   4 +-
 .../Armada7k8kMemoryInitPeiLib.inf            |  14 +-
 .../PciHostBridgeLib.inf                      |   2 +-
 .../Armada7k8kPciSegmentLib/PciSegmentLib.inf |   2 +-
 .../Armada7k8kSampleAtResetLib.inf            |   2 +-
 .../Armada7k8kSoCDescLib.inf                  |   4 +-
 .../RealTimeClockLib/RealTimeClockLib.inf     |   4 +-
 .../Marvell/Documentation/PortingGuide.txt    | 114 +++++-----
 .../Drivers/BoardDesc/MvBoardDescDxe.inf      |  18 +-
 .../Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf      |   2 +-
 .../Gpio/MvPca95xxDxe/MvPca95xxDxe.inf        |   2 +-
 .../Drivers/I2c/MvEepromDxe/MvEepromDxe.inf   |   6 +-
 .../Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf |  14 +-
 .../Drivers/Net/MvMdioDxe/MvMdioDxe.inf       |   2 +-
 .../Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.inf |  12 +-
 Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf |  16 +-
 .../NonDiscoverableDxe/NonDiscoverableDxe.inf |   2 +-
 .../Drivers/SdMmc/XenonDxe/XenonDxe.inf       |   2 +-
 .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf   |  14 +-
 .../Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.inf |   8 +-
 .../Spi/MvSpiFlashDxe/MvSpiFlashDxe.inf       |   2 +-
 .../Spi/MvSpiOrionDxe/MvSpiOrionDxe.inf       |   8 +-
 .../Marvell/Library/ComPhyLib/ComPhyLib.inf   |  28 +--
 Silicon/Marvell/Library/IcuLib/IcuLib.inf     |   4 +-
 Silicon/Marvell/Library/MppLib/MppLib.inf     |  94 ++++----
 .../Marvell/Library/MvGpioLib/MvGpioLib.inf   |   2 +-
 .../Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf |   2 +-
 Silicon/Marvell/Marvell.dec                   | 208 -----------------
 .../Include/IndustryStandard/MvSmc.h          |   0
 .../Include/Library/ArmadaBoardDescLib.h      |   0
 .../Include/Library/ArmadaIcuLib.h            |   0
 .../Include/Library/ArmadaSoCDescLib.h        |   0
 .../Include/Library/MppLib.h                  |   0
 .../Include/Library/MvComPhyLib.h             |   0
 .../Include/Library/MvGpioLib.h               |   0
 .../Include/Library/NonDiscoverableInitLib.h  |   0
 .../Include/Library/SampleAtResetLib.h        |   0
 .../Include/Library/UtmiPhyLib.h              |   0
 .../Include/Protocol/BoardDesc.h              |   0
 .../Include/Protocol/Eeprom.h                 |   0
 .../Include/Protocol/Mdio.h                   |   0
 .../Include/Protocol/MvI2c.h                  |   0
 .../Include/Protocol/MvPhy.h                  |   0
 .../Include/Protocol/Spi.h                    |   0
 .../Include/Protocol/SpiFlash.h               |   0
 .../MarvellSiliconPkg/MarvellSiliconPkg.dec   | 211 ++++++++++++++++++
 .../OcteonTx/AcpiTables/T91/Cn9130DbA.inf     |   2 +-
 .../OcteonTx/AcpiTables/T91/Cn9131DbA.inf     |   2 +-
 .../AcpiTables/T91/Cn913xCEx7Eval.inf         |   2 +-
 82 files changed, 852 insertions(+), 852 deletions(-)
 delete mode 100644 Silicon/Marvell/Marvell.dec
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/IndustryStandard/MvSmc.h (100%)
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/ArmadaBoardDescLib.h (100%)
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/ArmadaIcuLib.h (100%)
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/ArmadaSoCDescLib.h (100%)
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MppLib.h (100%)
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MvComPhyLib.h (100%)
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/MvGpioLib.h (100%)
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/NonDiscoverableInitLib.h (100%)
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/SampleAtResetLib.h (100%)
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Library/UtmiPhyLib.h (100%)
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/BoardDesc.h (100%)
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Eeprom.h (100%)
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Mdio.h (100%)
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/MvI2c.h (100%)
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/MvPhy.h (100%)
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/Spi.h (100%)
 rename Silicon/Marvell/{ => MarvellSiliconPkg}/Include/Protocol/SpiFlash.h (100%)
 create mode 100644 Silicon/Marvell/MarvellSiliconPkg/MarvellSiliconPkg.dec


base-commit: d6e36a151ff8365cdc55a6914cc5e6138d5788dc
-- 
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#109527): https://edk2.groups.io/g/devel/message/109527
Mute This Topic: https://groups.io/mt/101902576/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-