diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-10 15:24:19 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-10 15:24:19 +0300 |
| commit | de5857d05660a839b3ba81b0f24d9b98e927d2ac (patch) | |
| tree | 87b7a6d3f02db00602a413f780af477633b5bb44 /board | |
| parent | f91c3aa07e97196d07d7ff5f85857ad360480ee3 (diff) | |
| parent | 157bc52b0fa9d75611aeca9668c5227d6e64e05e (diff) | |
| download | u-boot-de5857d05660a839b3ba81b0f24d9b98e927d2ac.tar.xz | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- mvebu: dts: Armada8k enable mdio (Sven)
- a37xx: pci: Fix / enhance error handling (Pali)
- mvebu: espressobin/turris_: Enable GPT partition support (Pali)
- mvebu: sata_mv: Probe all ports (Tony)
- a37xx: pci: Don't spam about PIO Response Status (Marek)
Diffstat (limited to 'board')
| -rw-r--r-- | board/Marvell/dreamplug/dreamplug.c | 2 | ||||
| -rw-r--r-- | board/Marvell/sheevaplug/MAINTAINERS | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c index d5b6b22ddf..7ba14021b2 100644 --- a/board/Marvell/dreamplug/dreamplug.c +++ b/board/Marvell/dreamplug/dreamplug.c @@ -163,7 +163,7 @@ void reset_phy(void) char *eth0_name = "ethernet-controller@72000"; char *eth0_path = "/ocp@f1000000/ethernet-controller@72000/ethernet0-port@0"; char *eth1_name = "ethernet-controller@76000"; - char *eth1_path = "/ocp@f1000000/ethernet-controller@72000/ethernet1-port@0"; + char *eth1_path = "/ocp@f1000000/ethernet-controller@76000/ethernet1-port@0"; /* configure and initialize both PHY's */ mv_phy_88e1116_init(eth0_name, eth0_path); diff --git a/board/Marvell/sheevaplug/MAINTAINERS b/board/Marvell/sheevaplug/MAINTAINERS index 2b0103d07d..282f046667 100644 --- a/board/Marvell/sheevaplug/MAINTAINERS +++ b/board/Marvell/sheevaplug/MAINTAINERS @@ -1,5 +1,5 @@ SHEEVAPLUG BOARD -M: Prafulla Wadaskar <prafulla@marvell.com> +M: Tony Dinh <mibodhi@gmail.com> S: Maintained F: board/Marvell/sheevaplug/ F: include/configs/sheevaplug.h |