On Thu, Oct 20, 2016 at 11:02:50PM +0200, Marcin Wojtas wrote:
From: Bartosz Szczepanek bsz@semihalf.com
Armada 7040 development board comprise three different ports: eth0: SFP cage with fixed link to 1G eth1: Optional 8-port switch with fixed link to 2.5G eth2: 1G RGMII port with autonegotiation enabled
This change also required MPP setting modification.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Bartosz Szczepanek bsz@semihalf.com Signed-off-by: Marcin Wojtas mw@semihalf.com
Platforms/Marvell/Armada/Armada.dsc.inc | 1 + Platforms/Marvell/Armada/Armada70x0.dsc | 21 ++++++++++++++++++++- Platforms/Marvell/Armada/Armada70x0.fdf | 1 + 3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/Platforms/Marvell/Armada/Armada.dsc.inc b/Platforms/Marvell/Armada/Armada.dsc.inc index 7b47920..ac7bd81 100644 --- a/Platforms/Marvell/Armada/Armada.dsc.inc +++ b/Platforms/Marvell/Armada/Armada.dsc.inc @@ -403,6 +403,7 @@ MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf OpenPlatformPkg/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
- OpenPlatformPkg/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
Swap with subsequent line?
OpenPlatformPkg/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf diff --git a/Platforms/Marvell/Armada/Armada70x0.dsc b/Platforms/Marvell/Armada/Armada70x0.dsc index de314b9..87f526e 100644 --- a/Platforms/Marvell/Armada/Armada70x0.dsc +++ b/Platforms/Marvell/Armada/Armada70x0.dsc @@ -119,10 +119,29 @@ gMarvellTokenSpaceGuid.PcdMdioBaseAddress|0xF212A200 #PHY
- gMarvellTokenSpaceGuid.PcdPhyConnectionTypes|{ 0x0, 0x0 }
- gMarvellTokenSpaceGuid.PcdPhyConnectionTypes|{ 0x4, 0x4, 0x0 } gMarvellTokenSpaceGuid.PcdPhyDeviceIds|{ 0x0, 0x0 } gMarvellTokenSpaceGuid.PcdPhyStartupAutoneg|FALSE
- #NET
- gMarvellTokenSpaceGuid.PcdPhySmiAddresses|{ 0xff, 0x0, 0x1 }
- gMarvellTokenSpaceGuid.PcdPp2PortNumber|3
- gMarvellTokenSpaceGuid.PcdPp2PortIds|{ 0x0, 0x1, 0x2 }
- gMarvellTokenSpaceGuid.PcdPp2GopIndexes|{ 0x0, 0x2, 0x3 }
- gMarvellTokenSpaceGuid.PcdPp2InterfaceAlwaysUp|{ 0x1, 0x1, 0x0 }
- gMarvellTokenSpaceGuid.PcdPp2InterfaceSpeed|{ 0x3, 0x4, 0x3 }
- gMarvellTokenSpaceGuid.PcdPp2SharedAddress|0xf2000000
- gMarvellTokenSpaceGuid.PcdPp2GmacBaseAddress|0xf2130e00
- gMarvellTokenSpaceGuid.PcdPp2GmacObjSize|0x1000
- gMarvellTokenSpaceGuid.PcdPp2XlgBaseAddress|0xf2130f00
- gMarvellTokenSpaceGuid.PcdPp2XlgObjSize|0x1000
- gMarvellTokenSpaceGuid.PcdPp2Rfu1BaseAddress|0xf2441000
- gMarvellTokenSpaceGuid.PcdPp2SmiBaseAddress|0xf212A200
- gMarvellTokenSpaceGuid.PcdPp2ClockFrequency|333333333
- gMarvellTokenSpaceGuid.PcdPp2MacAddressPort0|{ 0x0a, 0x70, 0x40, 0x00, 0x00, 0x1 }
- gMarvellTokenSpaceGuid.PcdPp2MacAddressPort1|{ 0x0a, 0x70, 0x40, 0x00, 0x00, 0x2 }
- gMarvellTokenSpaceGuid.PcdPp2MacAddressPort2|{ 0x0a, 0x70, 0x40, 0x00, 0x00, 0x3 }
I'm really not a fan of hard-wired MAC addresses. While clearly I should have commented on that for 2/3, it didn't jump out at me. Can you make sure to put it behind an explicit build-time define called ENABLE_FALLBACK_MAC_ADDRESSES?
Also, some OCD sorting on the above?
- #ResetLib gMarvellTokenSpaceGuid.PcdResetRegAddress|0xf06f0084 gMarvellTokenSpaceGuid.PcdResetRegMask|0x1
diff --git a/Platforms/Marvell/Armada/Armada70x0.fdf b/Platforms/Marvell/Armada/Armada70x0.fdf index c56d4e3..20277b1 100644 --- a/Platforms/Marvell/Armada/Armada70x0.fdf +++ b/Platforms/Marvell/Armada/Armada70x0.fdf @@ -120,6 +120,7 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf INF OpenPlatformPkg/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
- INF OpenPlatformPkg/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
Swap with subsequent line?
INF OpenPlatformPkg/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf
# Multiple Console IO support
1.8.3.1