From: Narinder Dhillon <ndhil...@marvell.com>
New Marvell package name, path, and token space needs to be propagated
to all dependent files.
Signed-off-by: Narinder Dhillon <ndhil...@marvell.com>
---
.../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 +-
13 files changed, 246 insertions(+), 249 deletions(-)
diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
index 5df7498f71..362175f59e 100644
--- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
@@ -48,54 +48,54 @@
################################################################################
[PcdsFixedAtBuild.common]
#Platform description
- gMarvellTokenSpaceGuid.PcdProductPlatformName|"Armada 7040 DB"
- gMarvellTokenSpaceGuid.PcdProductVersion|"Rev. 1.5"
+ gMarvellSiliconTokenSpaceGuid.PcdProductPlatformName|"Armada 7040 DB"
+ gMarvellSiliconTokenSpaceGuid.PcdProductVersion|"Rev. 1.5"
#CP110 count
- gMarvellTokenSpaceGuid.PcdMaxCpCount|1
+ gMarvellSiliconTokenSpaceGuid.PcdMaxCpCount|1
#MPP
- gMarvellTokenSpaceGuid.PcdMppChipCount|2
+ gMarvellSiliconTokenSpaceGuid.PcdMppChipCount|2
# APN806-A0 MPP SET
- gMarvellTokenSpaceGuid.PcdChip0MppReverseFlag|FALSE
- gMarvellTokenSpaceGuid.PcdChip0MppBaseAddress|0xF06F4000
- gMarvellTokenSpaceGuid.PcdChip0MppPinCount|20
- gMarvellTokenSpaceGuid.PcdChip0MppSel0|{ 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1,
0x1, 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdChip0MppSel1|{ 0x1, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x3 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip0MppReverseFlag|FALSE
+ gMarvellSiliconTokenSpaceGuid.PcdChip0MppBaseAddress|0xF06F4000
+ gMarvellSiliconTokenSpaceGuid.PcdChip0MppPinCount|20
+ gMarvellSiliconTokenSpaceGuid.PcdChip0MppSel0|{ 0x1, 0x1, 0x1, 0x1, 0x1,
0x1, 0x1, 0x1, 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip0MppSel1|{ 0x1, 0x3, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x3 }
# CP110 MPP SET - Router configuration
- gMarvellTokenSpaceGuid.PcdChip1MppReverseFlag|FALSE
- gMarvellTokenSpaceGuid.PcdChip1MppBaseAddress|0xF2440000
- gMarvellTokenSpaceGuid.PcdChip1MppPinCount|64
- gMarvellTokenSpaceGuid.PcdChip1MppSel0|{ 0x4, 0x4, 0x4, 0x4, 0x4, 0x4, 0x4,
0x4, 0x4, 0x4 }
- gMarvellTokenSpaceGuid.PcdChip1MppSel1|{ 0x4, 0x4, 0x0, 0x3, 0x3, 0x3, 0x3,
0x0, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdChip1MppSel2|{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x9, 0xA }
- gMarvellTokenSpaceGuid.PcdChip1MppSel3|{ 0xA, 0x0, 0x7, 0x0, 0x7, 0x7, 0x7,
0x2, 0x2, 0x0 }
- gMarvellTokenSpaceGuid.PcdChip1MppSel4|{ 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1,
0x1, 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdChip1MppSel5|{ 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0xE,
0xE, 0xE, 0xE }
- gMarvellTokenSpaceGuid.PcdChip1MppSel6|{ 0xE, 0xE, 0xE, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppReverseFlag|FALSE
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppBaseAddress|0xF2440000
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppPinCount|64
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel0|{ 0x4, 0x4, 0x4, 0x4, 0x4,
0x4, 0x4, 0x4, 0x4, 0x4 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel1|{ 0x4, 0x4, 0x0, 0x3, 0x3,
0x3, 0x3, 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel2|{ 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x9, 0xA }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel3|{ 0xA, 0x0, 0x7, 0x0, 0x7,
0x7, 0x7, 0x2, 0x2, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel4|{ 0x0, 0x0, 0x0, 0x0, 0x1,
0x1, 0x1, 0x1, 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel5|{ 0x1, 0x1, 0x1, 0x1, 0x1,
0x1, 0xE, 0xE, 0xE, 0xE }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel6|{ 0xE, 0xE, 0xE, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0 }
# I2C
- gMarvellTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x50, 0x57, 0x60, 0x21 }
- gMarvellTokenSpaceGuid.PcdI2cSlaveBuses|{ 0x0, 0x0, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdI2cControllersEnabled|{ 0x0, 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdEepromI2cAddresses|{ 0x50, 0x57 }
- gMarvellTokenSpaceGuid.PcdEepromI2cBuses|{ 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdI2cClockFrequency|250000000
- gMarvellTokenSpaceGuid.PcdI2cBaudRate|100000
- gMarvellTokenSpaceGuid.PcdI2cBusCount|2
+ gMarvellSiliconTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x50, 0x57, 0x60, 0x21 }
+ gMarvellSiliconTokenSpaceGuid.PcdI2cSlaveBuses|{ 0x0, 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdI2cControllersEnabled|{ 0x0, 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdEepromI2cAddresses|{ 0x50, 0x57 }
+ gMarvellSiliconTokenSpaceGuid.PcdEepromI2cBuses|{ 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdI2cClockFrequency|250000000
+ gMarvellSiliconTokenSpaceGuid.PcdI2cBaudRate|100000
+ gMarvellSiliconTokenSpaceGuid.PcdI2cBusCount|2
#SPI
- gMarvellTokenSpaceGuid.PcdSpiRegBase|0xF2700680
- gMarvellTokenSpaceGuid.PcdSpiMaxFrequency|10000000
- gMarvellTokenSpaceGuid.PcdSpiClockFrequency|200000000
+ gMarvellSiliconTokenSpaceGuid.PcdSpiRegBase|0xF2700680
+ gMarvellSiliconTokenSpaceGuid.PcdSpiMaxFrequency|10000000
+ gMarvellSiliconTokenSpaceGuid.PcdSpiClockFrequency|200000000
- gMarvellTokenSpaceGuid.PcdSpiFlashMode|3
- gMarvellTokenSpaceGuid.PcdSpiFlashCs|0
+ gMarvellSiliconTokenSpaceGuid.PcdSpiFlashMode|3
+ gMarvellSiliconTokenSpaceGuid.PcdSpiFlashCs|0
#ComPhy
- gMarvellTokenSpaceGuid.PcdComPhyDevices|{ 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdComPhyDevices|{ 0x1 }
# ComPhy0
# 0: SGMII1 1.25 Gbps
# 1: USB3_HOST0 5 Gbps
@@ -103,36 +103,36 @@
# 3: SATA1 5 Gbps
# 4: USB3_HOST1 5 Gbps
# 5: PCIE2 5 Gbps
- gMarvellTokenSpaceGuid.PcdChip0ComPhyTypes|{ $(CP_SGMII1), $(CP_USB3_HOST0),
$(CP_SFI), $(CP_SATA1), $(CP_USB3_HOST1), $(CP_PCIE2) }
- gMarvellTokenSpaceGuid.PcdChip0ComPhySpeeds|{ $(CP_1_25G), $(CP_5G),
$(CP_10_3125G), $(CP_5G), $(CP_5G), $(CP_5G) }
+ gMarvellSiliconTokenSpaceGuid.PcdChip0ComPhyTypes|{ $(CP_SGMII1),
$(CP_USB3_HOST0), $(CP_SFI), $(CP_SATA1), $(CP_USB3_HOST1), $(CP_PCIE2) }
+ gMarvellSiliconTokenSpaceGuid.PcdChip0ComPhySpeeds|{ $(CP_1_25G), $(CP_5G),
$(CP_10_3125G), $(CP_5G), $(CP_5G), $(CP_5G) }
#UtmiPhy
- gMarvellTokenSpaceGuid.PcdUtmiControllersEnabled|{ 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdUtmiPortType|{ $(UTMI_USB_HOST0),
$(UTMI_USB_HOST1) }
+ gMarvellSiliconTokenSpaceGuid.PcdUtmiControllersEnabled|{ 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdUtmiPortType|{ $(UTMI_USB_HOST0),
$(UTMI_USB_HOST1) }
#MDIO
- gMarvellTokenSpaceGuid.PcdMdioControllersEnabled|{ 0x1, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdMdioControllersEnabled|{ 0x1, 0x0 }
#PHY
- gMarvellTokenSpaceGuid.PcdPhy2MdioController|{ 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPhyDeviceIds|{ 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPhySmiAddresses|{ 0x0, 0x1 }
- gMarvellTokenSpaceGuid.PcdPhyStartupAutoneg|FALSE
+ gMarvellSiliconTokenSpaceGuid.PcdPhy2MdioController|{ 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPhyDeviceIds|{ 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPhySmiAddresses|{ 0x0, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPhyStartupAutoneg|FALSE
#NET
- gMarvellTokenSpaceGuid.PcdPp2GopIndexes|{ 0x0, 0x2, 0x3 }
- gMarvellTokenSpaceGuid.PcdPp2InterfaceAlwaysUp|{ 0x0, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPp2InterfaceSpeed|{ $(PHY_SPEED_10000),
$(PHY_SPEED_1000), $(PHY_SPEED_1000) }
- gMarvellTokenSpaceGuid.PcdPp2PhyConnectionTypes|{ $(PHY_SFI), $(PHY_SGMII),
$(PHY_RGMII) }
- gMarvellTokenSpaceGuid.PcdPp2PhyIndexes|{ 0xFF, 0x0, 0x1 }
- gMarvellTokenSpaceGuid.PcdPp2Port2Controller|{ 0x0, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPp2PortIds|{ 0x0, 0x1, 0x2 }
- gMarvellTokenSpaceGuid.PcdPp2Controllers|{ 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2GopIndexes|{ 0x0, 0x2, 0x3 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2InterfaceAlwaysUp|{ 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2InterfaceSpeed|{ $(PHY_SPEED_10000),
$(PHY_SPEED_1000), $(PHY_SPEED_1000) }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2PhyConnectionTypes|{ $(PHY_SFI),
$(PHY_SGMII), $(PHY_RGMII) }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2PhyIndexes|{ 0xFF, 0x0, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2Port2Controller|{ 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2PortIds|{ 0x0, 0x1, 0x2 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2Controllers|{ 0x1 }
#PciEmulation
- gMarvellTokenSpaceGuid.PcdPciEXhci|{ 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdPciEAhci|{ 0x1 }
- gMarvellTokenSpaceGuid.PcdPciESdhci|{ 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPciEXhci|{ 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPciEAhci|{ 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPciESdhci|{ 0x1, 0x1 }
#RTC
- gMarvellTokenSpaceGuid.PcdRtcBaseAddress|0xF2284000
+ gMarvellSiliconTokenSpaceGuid.PcdRtcBaseAddress|0xF2284000
diff --git
a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf
b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf
index 20294ab43b..75331ae8e4 100644
---
a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf
+++
b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf
@@ -22,7 +22,7 @@
EmbeddedPkg/EmbeddedPkg.dec
MdeModulePkg/MdeModulePkg.dec
MdePkg/MdePkg.dec
- Silicon/Marvell/Marvell.dec
+ Silicon/Marvell/MarvellSiliconPkg/MarvellSiliconPkg.dec
[LibraryClasses]
DebugLib
diff --git
a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
index 946b9fd6d0..64623e33f8 100644
---
a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
+++
b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
@@ -29,7 +29,7 @@
EmbeddedPkg/EmbeddedPkg.dec
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- Silicon/Marvell/Marvell.dec
+ Silicon/Marvell/MarvellSiliconPkg/MarvellSiliconPkg.dec
[LibraryClasses]
DebugLib
diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
index 2698bd6573..22a0040265 100644
--- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
+++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
@@ -31,9 +31,6 @@
!include MdePkg/MdeLibs.dsc.inc
-[Components.common]
- Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf
-
[Components.AARCH64]
Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf
@@ -48,63 +45,63 @@
################################################################################
[PcdsFixedAtBuild.common]
#Platform description
- gMarvellTokenSpaceGuid.PcdProductPlatformName|"Armada 8040 DB"
- gMarvellTokenSpaceGuid.PcdProductVersion|"Rev. 1.4"
+ gMarvellSiliconTokenSpaceGuid.PcdProductPlatformName|"Armada 8040 DB"
+ gMarvellSiliconTokenSpaceGuid.PcdProductVersion|"Rev. 1.4"
#MPP
- gMarvellTokenSpaceGuid.PcdMppChipCount|3
+ gMarvellSiliconTokenSpaceGuid.PcdMppChipCount|3
# APN806-A0 MPP SET
- gMarvellTokenSpaceGuid.PcdChip0MppReverseFlag|FALSE
- gMarvellTokenSpaceGuid.PcdChip0MppBaseAddress|0xF06F4000
- gMarvellTokenSpaceGuid.PcdChip0MppPinCount|20
- gMarvellTokenSpaceGuid.PcdChip0MppSel0|{ 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1,
0x1, 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdChip0MppSel1|{ 0x1, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x3 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip0MppReverseFlag|FALSE
+ gMarvellSiliconTokenSpaceGuid.PcdChip0MppBaseAddress|0xF06F4000
+ gMarvellSiliconTokenSpaceGuid.PcdChip0MppPinCount|20
+ gMarvellSiliconTokenSpaceGuid.PcdChip0MppSel0|{ 0x1, 0x1, 0x1, 0x1, 0x1,
0x1, 0x1, 0x1, 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip0MppSel1|{ 0x1, 0x3, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x3 }
# CP110 MPP SET - master
- gMarvellTokenSpaceGuid.PcdChip1MppReverseFlag|FALSE
- gMarvellTokenSpaceGuid.PcdChip1MppBaseAddress|0xF2440000
- gMarvellTokenSpaceGuid.PcdChip1MppPinCount|64
- gMarvellTokenSpaceGuid.PcdChip1MppSel0|{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF }
- gMarvellTokenSpaceGuid.PcdChip1MppSel1|{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF }
- gMarvellTokenSpaceGuid.PcdChip1MppSel2|{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF }
- gMarvellTokenSpaceGuid.PcdChip1MppSel3|{ 0xFF, 0xFF, 0x7, 0x0, 0x7, 0xA,
0xA, 0x2, 0x2, 0x5 }
- gMarvellTokenSpaceGuid.PcdChip1MppSel4|{ 0x9, 0x9, 0x8, 0x8, 0x1, 0x1,
0x1, 0x1, 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdChip1MppSel5|{ 0x1, 0x1, 0x1, 0x1, 0x1, 0x1,
0xE, 0xE, 0xE, 0xE }
- gMarvellTokenSpaceGuid.PcdChip1MppSel6|{ 0xE, 0xE, 0xE, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppReverseFlag|FALSE
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppBaseAddress|0xF2440000
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppPinCount|64
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel0|{ 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel1|{ 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel2|{ 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel3|{ 0xFF, 0xFF, 0x7, 0x0, 0x7,
0xA, 0xA, 0x2, 0x2, 0x5 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel4|{ 0x9, 0x9, 0x8, 0x8, 0x1,
0x1, 0x1, 0x1, 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel5|{ 0x1, 0x1, 0x1, 0x1, 0x1,
0x1, 0xE, 0xE, 0xE, 0xE }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel6|{ 0xE, 0xE, 0xE, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0 }
# CP110 MPP SET - slave
- gMarvellTokenSpaceGuid.PcdChip2MppReverseFlag|FALSE
- gMarvellTokenSpaceGuid.PcdChip2MppBaseAddress|0xF4440000
- gMarvellTokenSpaceGuid.PcdChip2MppPinCount|64
- gMarvellTokenSpaceGuid.PcdChip2MppSel0|{ 0x3, 0x3, 0x3, 0x3, 0x3, 0x3,
0x3, 0x3, 0x3, 0x3 }
- gMarvellTokenSpaceGuid.PcdChip2MppSel1|{ 0x3, 0x3, 0x3, 0x3, 0x3, 0x3,
0x3, 0xFF, 0xFF, 0xFF }
- gMarvellTokenSpaceGuid.PcdChip2MppSel2|{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0x8, 0x9, 0xA }
- gMarvellTokenSpaceGuid.PcdChip2MppSel3|{ 0xA, 0x8, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF }
- gMarvellTokenSpaceGuid.PcdChip2MppSel4|{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF }
- gMarvellTokenSpaceGuid.PcdChip2MppSel5|{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF }
- gMarvellTokenSpaceGuid.PcdChip2MppSel6|{ 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppReverseFlag|FALSE
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppBaseAddress|0xF4440000
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppPinCount|64
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppSel0|{ 0x3, 0x3, 0x3, 0x3, 0x3,
0x3, 0x3, 0x3, 0x3, 0x3 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppSel1|{ 0x3, 0x3, 0x3, 0x3, 0x3,
0x3, 0x3, 0xFF, 0xFF, 0xFF }
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppSel2|{ 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0x8, 0x9, 0xA }
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppSel3|{ 0xA, 0x8, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppSel4|{ 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppSel5|{ 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppSel6|{ 0xFF, 0xFF, 0xFF, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0 }
# I2C
- gMarvellTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x50, 0x57, 0x50, 0x57, 0x21,
0x25 }
- gMarvellTokenSpaceGuid.PcdI2cSlaveBuses|{ 0x0, 0x0, 0x1, 0x1, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdI2cControllersEnabled|{ 0x0, 0x1, 0x0, 0x0, 0x1 }
- gMarvellTokenSpaceGuid.PcdEepromI2cAddresses|{ 0x50, 0x57, 0x50, 0x57 }
- gMarvellTokenSpaceGuid.PcdEepromI2cBuses|{ 0x0, 0x0, 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdI2cClockFrequency|250000000
- gMarvellTokenSpaceGuid.PcdI2cBaudRate|100000
- gMarvellTokenSpaceGuid.PcdI2cBusCount|2
+ gMarvellSiliconTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x50, 0x57, 0x50, 0x57,
0x21, 0x25 }
+ gMarvellSiliconTokenSpaceGuid.PcdI2cSlaveBuses|{ 0x0, 0x0, 0x1, 0x1, 0x0,
0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdI2cControllersEnabled|{ 0x0, 0x1, 0x0, 0x0,
0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdEepromI2cAddresses|{ 0x50, 0x57, 0x50, 0x57
}
+ gMarvellSiliconTokenSpaceGuid.PcdEepromI2cBuses|{ 0x0, 0x0, 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdI2cClockFrequency|250000000
+ gMarvellSiliconTokenSpaceGuid.PcdI2cBaudRate|100000
+ gMarvellSiliconTokenSpaceGuid.PcdI2cBusCount|2
#SPI
- gMarvellTokenSpaceGuid.PcdSpiRegBase|0xF4700680
- gMarvellTokenSpaceGuid.PcdSpiMaxFrequency|10000000
- gMarvellTokenSpaceGuid.PcdSpiClockFrequency|200000000
+ gMarvellSiliconTokenSpaceGuid.PcdSpiRegBase|0xF4700680
+ gMarvellSiliconTokenSpaceGuid.PcdSpiMaxFrequency|10000000
+ gMarvellSiliconTokenSpaceGuid.PcdSpiClockFrequency|200000000
- gMarvellTokenSpaceGuid.PcdSpiFlashMode|3
- gMarvellTokenSpaceGuid.PcdSpiFlashCs|0
+ gMarvellSiliconTokenSpaceGuid.PcdSpiFlashMode|3
+ gMarvellSiliconTokenSpaceGuid.PcdSpiFlashCs|0
#ComPhy
- gMarvellTokenSpaceGuid.PcdComPhyDevices|{ 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdComPhyDevices|{ 0x1, 0x1 }
# ComPhy0
# 0: PCIE0 5 Gbps
# 1: SATA0 5 Gbps
@@ -112,8 +109,8 @@
# 3: SATA1 5 Gbps
# 4: USB_HOST1 5 Gbps
# 5: PCIE2 5 Gbps
- gMarvellTokenSpaceGuid.PcdChip0ComPhyTypes|{ $(CP_PCIE0), $(CP_SATA0),
$(CP_SFI), $(CP_SATA1), $(CP_USB3_HOST1), $(CP_PCIE2) }
- gMarvellTokenSpaceGuid.PcdChip0ComPhySpeeds|{ $(CP_5G), $(CP_5G),
$(CP_10_3125G), $(CP_5G), $(CP_5G), $(CP_5G) }
+ gMarvellSiliconTokenSpaceGuid.PcdChip0ComPhyTypes|{ $(CP_PCIE0),
$(CP_SATA0), $(CP_SFI), $(CP_SATA1), $(CP_USB3_HOST1), $(CP_PCIE2) }
+ gMarvellSiliconTokenSpaceGuid.PcdChip0ComPhySpeeds|{ $(CP_5G), $(CP_5G),
$(CP_10_3125G), $(CP_5G), $(CP_5G), $(CP_5G) }
# ComPhy1
# 0: PCIE0 5 Gbps
# 1: SATA0 5 Gbps
@@ -121,36 +118,36 @@
# 3: SATA1 5 Gbps
# 4: PCIE1 5 Gbps
# 5: PCIE2 5 Gbps
- gMarvellTokenSpaceGuid.PcdChip1ComPhyTypes|{ $(CP_PCIE0), $(CP_SATA2),
$(CP_SFI), $(CP_SATA3), $(CP_PCIE1), $(CP_PCIE2) }
- gMarvellTokenSpaceGuid.PcdChip1ComPhySpeeds|{ $(CP_5G), $(CP_5G),
$(CP_10_3125G), $(CP_5G), $(CP_5G), $(CP_5G) }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1ComPhyTypes|{ $(CP_PCIE0),
$(CP_SATA2), $(CP_SFI), $(CP_SATA3), $(CP_PCIE1), $(CP_PCIE2) }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1ComPhySpeeds|{ $(CP_5G), $(CP_5G),
$(CP_10_3125G), $(CP_5G), $(CP_5G), $(CP_5G) }
#UtmiPhy
- gMarvellTokenSpaceGuid.PcdUtmiControllersEnabled|{ 0x1, 0x1, 0x1, 0x0 }
- gMarvellTokenSpaceGuid.PcdUtmiPortType|{ $(UTMI_USB_HOST0),
$(UTMI_USB_HOST1), $(UTMI_USB_HOST0), $(UTMI_USB_HOST1) }
+ gMarvellSiliconTokenSpaceGuid.PcdUtmiControllersEnabled|{ 0x1, 0x1, 0x1, 0x0
}
+ gMarvellSiliconTokenSpaceGuid.PcdUtmiPortType|{ $(UTMI_USB_HOST0),
$(UTMI_USB_HOST1), $(UTMI_USB_HOST0), $(UTMI_USB_HOST1) }
#MDIO
- gMarvellTokenSpaceGuid.PcdMdioControllersEnabled|{ 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdMdioControllersEnabled|{ 0x1, 0x1 }
#PHY
- gMarvellTokenSpaceGuid.PcdPhy2MdioController|{ 0x0, 0x1 }
- gMarvellTokenSpaceGuid.PcdPhyDeviceIds|{ 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPhySmiAddresses|{ 0x1, 0x0 }
- gMarvellTokenSpaceGuid.PcdPhyStartupAutoneg|FALSE
+ gMarvellSiliconTokenSpaceGuid.PcdPhy2MdioController|{ 0x0, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPhyDeviceIds|{ 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPhySmiAddresses|{ 0x1, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPhyStartupAutoneg|FALSE
#NET
- gMarvellTokenSpaceGuid.PcdPp2GopIndexes|{ 0x0, 0x3, 0x0, 0x2 }
- gMarvellTokenSpaceGuid.PcdPp2InterfaceAlwaysUp|{ 0x0, 0x0, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPp2InterfaceSpeed|{ $(PHY_SPEED_10000),
$(PHY_SPEED_1000), $(PHY_SPEED_10000), $(PHY_SPEED_1000) }
- gMarvellTokenSpaceGuid.PcdPp2PhyConnectionTypes|{ $(PHY_SFI), $(PHY_RGMII),
$(PHY_SFI), $(PHY_RGMII) }
- gMarvellTokenSpaceGuid.PcdPp2PhyIndexes|{ 0xFF, 0x0, 0xFF, 0x1 }
- gMarvellTokenSpaceGuid.PcdPp2Port2Controller|{ 0x0, 0x0, 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdPp2PortIds|{ 0x0, 0x2, 0x0, 0x1 }
- gMarvellTokenSpaceGuid.PcdPp2Controllers|{ 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2GopIndexes|{ 0x0, 0x3, 0x0, 0x2 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2InterfaceAlwaysUp|{ 0x0, 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2InterfaceSpeed|{ $(PHY_SPEED_10000),
$(PHY_SPEED_1000), $(PHY_SPEED_10000), $(PHY_SPEED_1000) }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2PhyConnectionTypes|{ $(PHY_SFI),
$(PHY_RGMII), $(PHY_SFI), $(PHY_RGMII) }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2PhyIndexes|{ 0xFF, 0x0, 0xFF, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2Port2Controller|{ 0x0, 0x0, 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2PortIds|{ 0x0, 0x2, 0x0, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2Controllers|{ 0x1, 0x1 }
#PciEmulation
- gMarvellTokenSpaceGuid.PcdPciEXhci|{ 0x1, 0x1, 0x1, 0x0 }
- gMarvellTokenSpaceGuid.PcdPciEAhci|{ 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdPciESdhci|{ 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPciEXhci|{ 0x1, 0x1, 0x1, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPciEAhci|{ 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPciESdhci|{ 0x1, 0x1 }
#RTC
- gMarvellTokenSpaceGuid.PcdRtcBaseAddress|0xF4284000
+ gMarvellSiliconTokenSpaceGuid.PcdRtcBaseAddress|0xF4284000
diff --git
a/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf
b/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf
index 07ee65dfa4..302e0f832f 100644
---
a/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf
+++
b/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf
@@ -22,7 +22,7 @@
EmbeddedPkg/EmbeddedPkg.dec
MdeModulePkg/MdeModulePkg.dec
MdePkg/MdePkg.dec
- Silicon/Marvell/Marvell.dec
+ Silicon/Marvell/MarvellSiliconPkg/MarvellSiliconPkg.dec
[LibraryClasses]
DebugLib
diff --git
a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
index fb303f3d89..261f2114c4 100644
---
a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
+++
b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
@@ -30,7 +30,7 @@
EmbeddedPkg/EmbeddedPkg.dec
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- Silicon/Marvell/Marvell.dec
+ Silicon/Marvell/MarvellSiliconPkg/MarvellSiliconPkg.dec
[LibraryClasses]
DebugLib
diff --git
a/Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9130DbABoardDescLib.inf
b/Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9130DbABoardDescLib.inf
index dfbdc84448..c93b3077c7 100644
--- a/Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9130DbABoardDescLib.inf
+++ b/Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9130DbABoardDescLib.inf
@@ -22,7 +22,7 @@
EmbeddedPkg/EmbeddedPkg.dec
MdeModulePkg/MdeModulePkg.dec
MdePkg/MdePkg.dec
- Silicon/Marvell/Marvell.dec
+ Silicon/Marvell/MarvellSiliconPkg/MarvellSiliconPkg.dec
[LibraryClasses]
DebugLib
diff --git
a/Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9132DbABoardDescLib.inf
b/Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9132DbABoardDescLib.inf
index 27a0214622..e0c84138b7 100644
--- a/Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9132DbABoardDescLib.inf
+++ b/Platform/Marvell/Cn913xDb/BoardDescriptionLib/Cn9132DbABoardDescLib.inf
@@ -22,7 +22,7 @@
EmbeddedPkg/EmbeddedPkg.dec
MdeModulePkg/MdeModulePkg.dec
MdePkg/MdePkg.dec
- Silicon/Marvell/Marvell.dec
+ Silicon/Marvell/MarvellSiliconPkg/MarvellSiliconPkg.dec
[LibraryClasses]
DebugLib
diff --git a/Platform/Marvell/Cn913xDb/Cn9130DbA.dsc.inc
b/Platform/Marvell/Cn913xDb/Cn9130DbA.dsc.inc
index e4d4c8e073..61bfdc8eb6 100644
--- a/Platform/Marvell/Cn913xDb/Cn9130DbA.dsc.inc
+++ b/Platform/Marvell/Cn913xDb/Cn9130DbA.dsc.inc
@@ -14,47 +14,47 @@
################################################################################
[PcdsFixedAtBuild.common]
# CP115 count
- gMarvellTokenSpaceGuid.PcdMaxCpCount|1
+ gMarvellSiliconTokenSpaceGuid.PcdMaxCpCount|1
# MPP
- gMarvellTokenSpaceGuid.PcdMppChipCount|2
+ gMarvellSiliconTokenSpaceGuid.PcdMppChipCount|2
# APN807 MPP
- gMarvellTokenSpaceGuid.PcdChip0MppReverseFlag|FALSE
- gMarvellTokenSpaceGuid.PcdChip0MppBaseAddress|0xF06F4000
- gMarvellTokenSpaceGuid.PcdChip0MppPinCount|20
- gMarvellTokenSpaceGuid.PcdChip0MppSel0|{ 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1,
0x1, 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdChip0MppSel1|{ 0x1, 0x3, 0x1, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x3 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip0MppReverseFlag|FALSE
+ gMarvellSiliconTokenSpaceGuid.PcdChip0MppBaseAddress|0xF06F4000
+ gMarvellSiliconTokenSpaceGuid.PcdChip0MppPinCount|20
+ gMarvellSiliconTokenSpaceGuid.PcdChip0MppSel0|{ 0x1, 0x1, 0x1, 0x1, 0x1,
0x1, 0x1, 0x1, 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip0MppSel1|{ 0x1, 0x3, 0x1, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x3 }
# CP115 #0 MPP
- gMarvellTokenSpaceGuid.PcdChip1MppReverseFlag|FALSE
- gMarvellTokenSpaceGuid.PcdChip1MppBaseAddress|0xF2440000
- gMarvellTokenSpaceGuid.PcdChip1MppPinCount|64
- gMarvellTokenSpaceGuid.PcdChip1MppSel0|{ 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3,
0x3, 0x3, 0x3 }
- gMarvellTokenSpaceGuid.PcdChip1MppSel1|{ 0x3, 0x3, 0x0, 0x3, 0x3, 0x3, 0x3,
0x1, 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdChip1MppSel2|{ 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1,
0x1, 0x3, 0xA }
- gMarvellTokenSpaceGuid.PcdChip1MppSel3|{ 0xA, 0x3, 0x7, 0x6, 0x7, 0x2, 0x2,
0x2, 0x2, 0x1 }
- gMarvellTokenSpaceGuid.PcdChip1MppSel4|{ 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1,
0x1, 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdChip1MppSel5|{ 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0xE,
0xE, 0xE, 0xE }
- gMarvellTokenSpaceGuid.PcdChip1MppSel6|{ 0xE, 0xE, 0xE, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppReverseFlag|FALSE
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppBaseAddress|0xF2440000
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppPinCount|64
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel0|{ 0x3, 0x3, 0x3, 0x3, 0x3,
0x3, 0x3, 0x3, 0x3, 0x3 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel1|{ 0x3, 0x3, 0x0, 0x3, 0x3,
0x3, 0x3, 0x1, 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel2|{ 0x1, 0x1, 0x1, 0x1, 0x1,
0x1, 0x1, 0x1, 0x3, 0xA }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel3|{ 0xA, 0x3, 0x7, 0x6, 0x7,
0x2, 0x2, 0x2, 0x2, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel4|{ 0x1, 0x1, 0x1, 0x1, 0x1,
0x1, 0x1, 0x1, 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel5|{ 0x1, 0x1, 0x1, 0x1, 0x1,
0x1, 0xE, 0xE, 0xE, 0xE }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1MppSel6|{ 0xE, 0xE, 0xE, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0 }
# I2C
- gMarvellTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x21 }
- gMarvellTokenSpaceGuid.PcdI2cSlaveBuses|{ 0x0 }
- gMarvellTokenSpaceGuid.PcdI2cControllersEnabled|{ 0x0, 0x1 }
- gMarvellTokenSpaceGuid.PcdI2cClockFrequency|250000000
- gMarvellTokenSpaceGuid.PcdI2cBaudRate|100000
+ gMarvellSiliconTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x21 }
+ gMarvellSiliconTokenSpaceGuid.PcdI2cSlaveBuses|{ 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdI2cControllersEnabled|{ 0x0, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdI2cClockFrequency|250000000
+ gMarvellSiliconTokenSpaceGuid.PcdI2cBaudRate|100000
# SPI
- gMarvellTokenSpaceGuid.PcdSpiRegBase|0xF2700680
- gMarvellTokenSpaceGuid.PcdSpiMaxFrequency|10000000
- gMarvellTokenSpaceGuid.PcdSpiClockFrequency|200000000
+ gMarvellSiliconTokenSpaceGuid.PcdSpiRegBase|0xF2700680
+ gMarvellSiliconTokenSpaceGuid.PcdSpiMaxFrequency|10000000
+ gMarvellSiliconTokenSpaceGuid.PcdSpiClockFrequency|200000000
- gMarvellTokenSpaceGuid.PcdSpiFlashMode|3
- gMarvellTokenSpaceGuid.PcdSpiFlashCs|0
+ gMarvellSiliconTokenSpaceGuid.PcdSpiFlashMode|3
+ gMarvellSiliconTokenSpaceGuid.PcdSpiFlashCs|0
# ComPhy
- gMarvellTokenSpaceGuid.PcdComPhyDevices|{ 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdComPhyDevices|{ 0x1 }
# ComPhy0
# 0: PCIE0 5 Gbps
# 1: PCIE0 5 Gbps
@@ -62,39 +62,39 @@
# 3: PCIE0 5 Gbps
# 4: SFI 10.31 Gbps
# 5: SATA1 5 Gbps
- gMarvellTokenSpaceGuid.PcdChip0ComPhyTypes|{ $(CP_PCIE0), $(CP_PCIE0),
$(CP_PCIE0), $(CP_PCIE0), $(CP_SFI), $(CP_SATA1)}
- gMarvellTokenSpaceGuid.PcdChip0ComPhySpeeds|{ $(CP_5G), $(CP_5G), $(CP_5G),
$(CP_5G), $(CP_10_3125G), $(CP_5G) }
+ gMarvellSiliconTokenSpaceGuid.PcdChip0ComPhyTypes|{ $(CP_PCIE0),
$(CP_PCIE0), $(CP_PCIE0), $(CP_PCIE0), $(CP_SFI), $(CP_SATA1)}
+ gMarvellSiliconTokenSpaceGuid.PcdChip0ComPhySpeeds|{ $(CP_5G), $(CP_5G),
$(CP_5G), $(CP_5G), $(CP_10_3125G), $(CP_5G) }
# UtmiPhy
- gMarvellTokenSpaceGuid.PcdUtmiControllersEnabled|{ 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdUtmiPortType|{ $(UTMI_USB_HOST0),
$(UTMI_USB_HOST1) }
+ gMarvellSiliconTokenSpaceGuid.PcdUtmiControllersEnabled|{ 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdUtmiPortType|{ $(UTMI_USB_HOST0),
$(UTMI_USB_HOST1) }
# MDIO
- gMarvellTokenSpaceGuid.PcdMdioControllersEnabled|{ 0x1, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdMdioControllersEnabled|{ 0x1, 0x0 }
# PHY
- gMarvellTokenSpaceGuid.PcdPhy2MdioController|{ 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPhyDeviceIds|{ 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPhySmiAddresses|{ 0x0, 0x1 }
- gMarvellTokenSpaceGuid.PcdPhyStartupAutoneg|FALSE
+ gMarvellSiliconTokenSpaceGuid.PcdPhy2MdioController|{ 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPhyDeviceIds|{ 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPhySmiAddresses|{ 0x0, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPhyStartupAutoneg|FALSE
# NET
- gMarvellTokenSpaceGuid.PcdPp2GopIndexes|{ 0x0, 0x2, 0x3 }
- gMarvellTokenSpaceGuid.PcdPp2InterfaceAlwaysUp|{ 0x0, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPp2InterfaceSpeed|{ $(PHY_SPEED_10000),
$(PHY_SPEED_1000), $(PHY_SPEED_1000) }
- gMarvellTokenSpaceGuid.PcdPp2PhyConnectionTypes|{ $(PHY_SFI), $(PHY_RGMII),
$(PHY_RGMII) }
- gMarvellTokenSpaceGuid.PcdPp2PhyIndexes|{ 0xFF, 0x0, 0x1 }
- gMarvellTokenSpaceGuid.PcdPp2Port2Controller|{ 0x0, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPp2PortIds|{ 0x0, 0x1, 0x2 }
- gMarvellTokenSpaceGuid.PcdPp2Controllers|{ 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2GopIndexes|{ 0x0, 0x2, 0x3 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2InterfaceAlwaysUp|{ 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2InterfaceSpeed|{ $(PHY_SPEED_10000),
$(PHY_SPEED_1000), $(PHY_SPEED_1000) }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2PhyConnectionTypes|{ $(PHY_SFI),
$(PHY_RGMII), $(PHY_RGMII) }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2PhyIndexes|{ 0xFF, 0x0, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2Port2Controller|{ 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2PortIds|{ 0x0, 0x1, 0x2 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2Controllers|{ 0x1 }
# NonDiscoverableDevices
- gMarvellTokenSpaceGuid.PcdPciEXhci|{ 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdPciEAhci|{ 0x1 }
- gMarvellTokenSpaceGuid.PcdPciESdhci|{ 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPciEXhci|{ 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPciEAhci|{ 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPciESdhci|{ 0x1, 0x1 }
# RTC
- gMarvellTokenSpaceGuid.PcdRtcBaseAddress|0xF2284000
+ gMarvellSiliconTokenSpaceGuid.PcdRtcBaseAddress|0xF2284000
# Variable store
- gMarvellTokenSpaceGuid.PcdSpiMemoryMapped|FALSE
+ gMarvellSiliconTokenSpaceGuid.PcdSpiMemoryMapped|FALSE
diff --git a/Platform/Marvell/Cn913xDb/Cn9131DbA.dsc.inc
b/Platform/Marvell/Cn913xDb/Cn9131DbA.dsc.inc
index 7235b9f86e..8166f441b7 100644
--- a/Platform/Marvell/Cn913xDb/Cn9131DbA.dsc.inc
+++ b/Platform/Marvell/Cn913xDb/Cn9131DbA.dsc.inc
@@ -14,25 +14,25 @@
################################################################################
[PcdsFixedAtBuild.common]
# CP115 count
- gMarvellTokenSpaceGuid.PcdMaxCpCount|2
+ gMarvellSiliconTokenSpaceGuid.PcdMaxCpCount|2
# MPP
- gMarvellTokenSpaceGuid.PcdMppChipCount|3
+ gMarvellSiliconTokenSpaceGuid.PcdMppChipCount|3
# CP115 #1 MPP
- gMarvellTokenSpaceGuid.PcdChip2MppReverseFlag|FALSE
- gMarvellTokenSpaceGuid.PcdChip2MppBaseAddress|0xF4440000
- gMarvellTokenSpaceGuid.PcdChip2MppPinCount|64
- gMarvellTokenSpaceGuid.PcdChip2MppSel0|{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdChip2MppSel1|{ 0x0, 0x0, 0x0, 0x3, 0x3, 0x3, 0x3,
0x0, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdChip2MppSel2|{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x9, 0x0 }
- gMarvellTokenSpaceGuid.PcdChip2MppSel3|{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0x7,
0x2, 0x2, 0x0 }
- gMarvellTokenSpaceGuid.PcdChip2MppSel4|{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdChip2MppSel5|{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdChip2MppSel6|{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppReverseFlag|FALSE
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppBaseAddress|0xF4440000
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppPinCount|64
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppSel0|{ 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppSel1|{ 0x0, 0x0, 0x0, 0x3, 0x3,
0x3, 0x3, 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppSel2|{ 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x9, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppSel3|{ 0x0, 0x0, 0x0, 0x0, 0x0,
0x7, 0x7, 0x2, 0x2, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppSel4|{ 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppSel5|{ 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip2MppSel6|{ 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0 }
# ComPhy
- gMarvellTokenSpaceGuid.PcdComPhyDevices|{ 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdComPhyDevices|{ 0x1, 0x1 }
# ComPhy1
# 0: PCIE0 5 Gbps
# 1: PCIE0 5 Gbps
@@ -40,33 +40,33 @@
# 3: USB3_HOST1 5 Gbps
# 4: SFI 10.31 Gbps
# 5: SATA1 5 Gbps
- gMarvellTokenSpaceGuid.PcdChip1ComPhyTypes|{ $(CP_PCIE0), $(CP_PCIE0),
$(CP_UNCONNECTED), $(CP_USB3_HOST1), $(CP_SFI), $(CP_SATA1)}
- gMarvellTokenSpaceGuid.PcdChip1ComPhySpeeds|{ $(CP_5G), $(CP_5G),
$(CP_DEFAULT), $(CP_5G), $(CP_10_3125G), $(CP_5G) }
+ gMarvellSiliconTokenSpaceGuid.PcdChip1ComPhyTypes|{ $(CP_PCIE0),
$(CP_PCIE0), $(CP_UNCONNECTED), $(CP_USB3_HOST1), $(CP_SFI), $(CP_SATA1)}
+ gMarvellSiliconTokenSpaceGuid.PcdChip1ComPhySpeeds|{ $(CP_5G), $(CP_5G),
$(CP_DEFAULT), $(CP_5G), $(CP_10_3125G), $(CP_5G) }
# UtmiPhy
- gMarvellTokenSpaceGuid.PcdUtmiControllersEnabled|{ 0x1, 0x1, 0x0, 0x1 }
- gMarvellTokenSpaceGuid.PcdUtmiPortType|{ $(UTMI_USB_HOST0),
$(UTMI_USB_HOST1), $(UTMI_USB_HOST0), $(UTMI_USB_HOST1) }
+ gMarvellSiliconTokenSpaceGuid.PcdUtmiControllersEnabled|{ 0x1, 0x1, 0x0, 0x1
}
+ gMarvellSiliconTokenSpaceGuid.PcdUtmiPortType|{ $(UTMI_USB_HOST0),
$(UTMI_USB_HOST1), $(UTMI_USB_HOST0), $(UTMI_USB_HOST1) }
# MDIO
- gMarvellTokenSpaceGuid.PcdMdioControllersEnabled|{ 0x1, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdMdioControllersEnabled|{ 0x1, 0x0 }
# PHY
- gMarvellTokenSpaceGuid.PcdPhy2MdioController|{ 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPhyDeviceIds|{ 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPhySmiAddresses|{ 0x0, 0x1 }
- gMarvellTokenSpaceGuid.PcdPhyStartupAutoneg|FALSE
+ gMarvellSiliconTokenSpaceGuid.PcdPhy2MdioController|{ 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPhyDeviceIds|{ 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPhySmiAddresses|{ 0x0, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPhyStartupAutoneg|FALSE
# NET
- gMarvellTokenSpaceGuid.PcdPp2GopIndexes|{ 0x0, 0x2, 0x3, 0x0 }
- gMarvellTokenSpaceGuid.PcdPp2InterfaceAlwaysUp|{ 0x0, 0x0, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPp2InterfaceSpeed|{ $(PHY_SPEED_10000),
$(PHY_SPEED_1000), $(PHY_SPEED_1000), $(PHY_SPEED_10000) }
- gMarvellTokenSpaceGuid.PcdPp2PhyConnectionTypes|{ $(PHY_SFI), $(PHY_RGMII),
$(PHY_RGMII), $(PHY_SFI) }
- gMarvellTokenSpaceGuid.PcdPp2PhyIndexes|{ 0xFF, 0x0, 0x1, 0xFF }
- gMarvellTokenSpaceGuid.PcdPp2Port2Controller|{ 0x0, 0x0, 0x0, 0x1 }
- gMarvellTokenSpaceGuid.PcdPp2PortIds|{ 0x0, 0x1, 0x2, 0x0 }
- gMarvellTokenSpaceGuid.PcdPp2Controllers|{ 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2GopIndexes|{ 0x0, 0x2, 0x3, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2InterfaceAlwaysUp|{ 0x0, 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2InterfaceSpeed|{ $(PHY_SPEED_10000),
$(PHY_SPEED_1000), $(PHY_SPEED_1000), $(PHY_SPEED_10000) }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2PhyConnectionTypes|{ $(PHY_SFI),
$(PHY_RGMII), $(PHY_RGMII), $(PHY_SFI) }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2PhyIndexes|{ 0xFF, 0x0, 0x1, 0xFF }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2Port2Controller|{ 0x0, 0x0, 0x0, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2PortIds|{ 0x0, 0x1, 0x2, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2Controllers|{ 0x1, 0x1 }
# NonDiscoverableDevices
- gMarvellTokenSpaceGuid.PcdPciEXhci|{ 0x1, 0x1, 0x0, 0x1 }
- gMarvellTokenSpaceGuid.PcdPciEAhci|{ 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdPciESdhci|{ 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPciEXhci|{ 0x1, 0x1, 0x0, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPciEAhci|{ 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPciESdhci|{ 0x1, 0x1 }
diff --git a/Platform/Marvell/Cn913xDb/Cn9132DbA.dsc.inc
b/Platform/Marvell/Cn913xDb/Cn9132DbA.dsc.inc
index a0b90fac1c..909f0fbc78 100644
--- a/Platform/Marvell/Cn913xDb/Cn9132DbA.dsc.inc
+++ b/Platform/Marvell/Cn913xDb/Cn9132DbA.dsc.inc
@@ -14,25 +14,25 @@
################################################################################
[PcdsFixedAtBuild.common]
# CP115 count
- gMarvellTokenSpaceGuid.PcdMaxCpCount|3
+ gMarvellSiliconTokenSpaceGuid.PcdMaxCpCount|3
# MPP
- gMarvellTokenSpaceGuid.PcdMppChipCount|4
+ gMarvellSiliconTokenSpaceGuid.PcdMppChipCount|4
# CP115 #2 MPP
- gMarvellTokenSpaceGuid.PcdChip3MppReverseFlag|FALSE
- gMarvellTokenSpaceGuid.PcdChip3MppBaseAddress|0xF6440000
- gMarvellTokenSpaceGuid.PcdChip3MppPinCount|64
- gMarvellTokenSpaceGuid.PcdChip3MppSel0|{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdChip3MppSel1|{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdChip3MppSel2|{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x9, 0x9, 0x0 }
- gMarvellTokenSpaceGuid.PcdChip3MppSel3|{ 0x0, 0x0, 0x8, 0x0, 0x8, 0x0, 0x0,
0x2, 0x2, 0x0 }
- gMarvellTokenSpaceGuid.PcdChip3MppSel4|{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdChip3MppSel5|{ 0x0, 0x0, 0x0, 0x0, 0xA, 0xB, 0xE,
0xE, 0xE, 0xE }
- gMarvellTokenSpaceGuid.PcdChip3MppSel6|{ 0xE, 0xE, 0xE, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip3MppReverseFlag|FALSE
+ gMarvellSiliconTokenSpaceGuid.PcdChip3MppBaseAddress|0xF6440000
+ gMarvellSiliconTokenSpaceGuid.PcdChip3MppPinCount|64
+ gMarvellSiliconTokenSpaceGuid.PcdChip3MppSel0|{ 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip3MppSel1|{ 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip3MppSel2|{ 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x9, 0x9, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip3MppSel3|{ 0x0, 0x0, 0x8, 0x0, 0x8,
0x0, 0x0, 0x2, 0x2, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip3MppSel4|{ 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdChip3MppSel5|{ 0x0, 0x0, 0x0, 0x0, 0xA,
0xB, 0xE, 0xE, 0xE, 0xE }
+ gMarvellSiliconTokenSpaceGuid.PcdChip3MppSel6|{ 0xE, 0xE, 0xE, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0 }
# ComPhy
- gMarvellTokenSpaceGuid.PcdComPhyDevices|{ 0x1, 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdComPhyDevices|{ 0x1, 0x1, 0x1 }
# ComPhy1
# 0: PCIE0 5 Gbps
# 1: PCIE0 5 Gbps
@@ -40,33 +40,33 @@
# 3: USB3_HOST1 5 Gbps
# 4: SFI 10.31 Gbps
# 5: PCIE2 5 Gbps
- gMarvellTokenSpaceGuid.PcdChip2ComPhyTypes|{ $(CP_PCIE0), $(CP_PCIE0),
$(CP_SATA0), $(CP_USB3_HOST1), $(CP_SFI), $(CP_PCIE2)}
- gMarvellTokenSpaceGuid.PcdChip2ComPhySpeeds|{ $(CP_5G), $(CP_5G), $(CP_5G),
$(CP_5G), $(CP_10_3125G), $(CP_5G) }
+ gMarvellSiliconTokenSpaceGuid.PcdChip2ComPhyTypes|{ $(CP_PCIE0),
$(CP_PCIE0), $(CP_SATA0), $(CP_USB3_HOST1), $(CP_SFI), $(CP_PCIE2)}
+ gMarvellSiliconTokenSpaceGuid.PcdChip2ComPhySpeeds|{ $(CP_5G), $(CP_5G),
$(CP_5G), $(CP_5G), $(CP_10_3125G), $(CP_5G) }
# UtmiPhy
- gMarvellTokenSpaceGuid.PcdUtmiControllersEnabled|{ 0x1, 0x1, 0x0, 0x1, 0x1,
0x1 }
- gMarvellTokenSpaceGuid.PcdUtmiPortType|{ $(UTMI_USB_HOST0),
$(UTMI_USB_HOST1), $(UTMI_USB_HOST0), $(UTMI_USB_HOST1), $(UTMI_USB_HOST0),
$(UTMI_USB_HOST1) }
+ gMarvellSiliconTokenSpaceGuid.PcdUtmiControllersEnabled|{ 0x1, 0x1, 0x0,
0x1, 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdUtmiPortType|{ $(UTMI_USB_HOST0),
$(UTMI_USB_HOST1), $(UTMI_USB_HOST0), $(UTMI_USB_HOST1), $(UTMI_USB_HOST0),
$(UTMI_USB_HOST1) }
# MDIO
- gMarvellTokenSpaceGuid.PcdMdioControllersEnabled|{ 0x1, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdMdioControllersEnabled|{ 0x1, 0x0 }
# PHY
- gMarvellTokenSpaceGuid.PcdPhy2MdioController|{ 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPhyDeviceIds|{ 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPhySmiAddresses|{ 0x0, 0x1 }
- gMarvellTokenSpaceGuid.PcdPhyStartupAutoneg|FALSE
+ gMarvellSiliconTokenSpaceGuid.PcdPhy2MdioController|{ 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPhyDeviceIds|{ 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPhySmiAddresses|{ 0x0, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPhyStartupAutoneg|FALSE
# NET
- gMarvellTokenSpaceGuid.PcdPp2GopIndexes|{ 0x0, 0x2, 0x3, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPp2InterfaceAlwaysUp|{ 0x0, 0x0, 0x0, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPp2InterfaceSpeed|{ $(PHY_SPEED_10000),
$(PHY_SPEED_1000), $(PHY_SPEED_1000), $(PHY_SPEED_10000), $(PHY_SPEED_10000) }
- gMarvellTokenSpaceGuid.PcdPp2PhyConnectionTypes|{ $(PHY_SFI), $(PHY_RGMII),
$(PHY_RGMII), $(PHY_SFI), $(PHY_SFI) }
- gMarvellTokenSpaceGuid.PcdPp2PhyIndexes|{ 0xFF, 0x0, 0x1, 0xFF, 0xFF }
- gMarvellTokenSpaceGuid.PcdPp2Port2Controller|{ 0x0, 0x0, 0x0, 0x1, 0x2 }
- gMarvellTokenSpaceGuid.PcdPp2PortIds|{ 0x0, 0x1, 0x2, 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPp2Controllers|{ 0x1, 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2GopIndexes|{ 0x0, 0x2, 0x3, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2InterfaceAlwaysUp|{ 0x0, 0x0, 0x0, 0x0,
0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2InterfaceSpeed|{ $(PHY_SPEED_10000),
$(PHY_SPEED_1000), $(PHY_SPEED_1000), $(PHY_SPEED_10000), $(PHY_SPEED_10000) }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2PhyConnectionTypes|{ $(PHY_SFI),
$(PHY_RGMII), $(PHY_RGMII), $(PHY_SFI), $(PHY_SFI) }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2PhyIndexes|{ 0xFF, 0x0, 0x1, 0xFF, 0xFF }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2Port2Controller|{ 0x0, 0x0, 0x0, 0x1,
0x2 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2PortIds|{ 0x0, 0x1, 0x2, 0x0, 0x0 }
+ gMarvellSiliconTokenSpaceGuid.PcdPp2Controllers|{ 0x1, 0x1, 0x1 }
# NonDiscoverableDevices
- gMarvellTokenSpaceGuid.PcdPciEXhci|{ 0x1, 0x1, 0x0, 0x1, 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdPciEAhci|{ 0x1, 0x1, 0x1 }
- gMarvellTokenSpaceGuid.PcdPciESdhci|{ 0x1, 0x1, 0x0, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPciEXhci|{ 0x1, 0x1, 0x0, 0x1, 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPciEAhci|{ 0x1, 0x1, 0x1 }
+ gMarvellSiliconTokenSpaceGuid.PcdPciESdhci|{ 0x1, 0x1, 0x0, 0x1 }
diff --git a/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
b/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
index ff91d10142..dc18e94dbc 100644
--- a/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
+++ b/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
@@ -69,10 +69,10 @@
[PcdsFixedAtBuild.common]
#Platform description
!if $(CN9130)
- gMarvellTokenSpaceGuid.PcdProductPlatformName|"CN9130 DB-A"
+ gMarvellSiliconTokenSpaceGuid.PcdProductPlatformName|"CN9130 DB-A"
!elseif $(CN9131)
- gMarvellTokenSpaceGuid.PcdProductPlatformName|"CN9131 DB-A"
+ gMarvellSiliconTokenSpaceGuid.PcdProductPlatformName|"CN9131 DB-A"
!elseif $(CN9132)
- gMarvellTokenSpaceGuid.PcdProductPlatformName|"CN9132 DB-A"
+ gMarvellSiliconTokenSpaceGuid.PcdProductPlatformName|"CN9132 DB-A"
!endif
- gMarvellTokenSpaceGuid.PcdProductVersion|"Rev. 1.1"
+ gMarvellSiliconTokenSpaceGuid.PcdProductVersion|"Rev. 1.1"
diff --git
a/Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
b/Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
index f7cfb3684d..e4f0cf6bd6 100644
---
a/Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
+++
b/Platform/Marvell/Cn913xDb/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
@@ -23,7 +23,7 @@
EmbeddedPkg/EmbeddedPkg.dec
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- Silicon/Marvell/Marvell.dec
+ Silicon/Marvell/MarvellSiliconPkg/MarvellSiliconPkg.dec
[LibraryClasses]
DebugLib
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#109530): https://edk2.groups.io/g/devel/message/109530
Mute This Topic: https://groups.io/mt/101902579/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
