diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-04 11:05:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-04 11:05:48 -0400 |
| commit | a1f5f4ac20c0947afda93f9b906facfbee2708fe (patch) | |
| tree | c80b3bcd8031c8613d8f7b3c8c95c3079e9d81e4 | |
| parent | 143414c03fa72468fa8ce0d1ded21a4a616400f9 (diff) | |
| parent | b40745e5c29a45ebe7efce53a1e3ba751d0ef351 (diff) | |
| download | u-boot-a1f5f4ac20c0947afda93f9b906facfbee2708fe.zip u-boot-a1f5f4ac20c0947afda93f9b906facfbee2708fe.tar.gz u-boot-a1f5f4ac20c0947afda93f9b906facfbee2708fe.tar.bz2 | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- 2 MVEBU related fixes
| -rw-r--r-- | arch/arm/dts/armada-3720-uDPU.dts | 18 | ||||
| -rw-r--r-- | cmd/mvebu/bubt.c | 4 |
2 files changed, 8 insertions, 14 deletions
diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts index 683dac2..07c7b91 100644 --- a/arch/arm/dts/armada-3720-uDPU.dts +++ b/arch/arm/dts/armada-3720-uDPU.dts @@ -109,11 +109,11 @@ &comphy { phy0 { phy-type = <PHY_TYPE_SGMII1>; - phy-speed = <PHY_SPEED_1_25G>; + phy-speed = <PHY_SPEED_3_125G>; }; phy1 { phy-type = <PHY_TYPE_SGMII0>; - phy-speed = <PHY_SPEED_1_25G>; + phy-speed = <PHY_SPEED_3_125G>; }; phy2 { @@ -125,22 +125,16 @@ ð0 { pinctrl-0 = <&pcie_pins>; status = "okay"; - phy-mode = "sgmii"; + phy-mode = "2500base-x"; + managed = "in-band-status"; phy = <ðphy0>; - fixed-link { - speed = <1000>; - full-duplex; - }; }; ð1 { status = "okay"; - phy-mode = "sgmii"; + phy-mode = "2500base-x"; + managed = "in-band-status"; phy = <ðphy1>; - fixed-link { - speed = <1000>; - full-duplex; - }; }; &i2c0 { diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index dc0ce01..ef53153 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -730,8 +730,8 @@ static int bubt_check_boot_mode(const struct bubt_dev *dst) for (int i = 0; i < ARRAY_SIZE(a38x_boot_modes); i++) { if (a38x_boot_modes[i].id == hdr->blockid) { - printf("Error: A38x image meant to be " - "booted from \"%s\", not \"%s\"!\n", + printf("Error: A38x image meant to be booted from " + "\"%s\", not \"%s\"!\n", a38x_boot_modes[i].name, dst->name); return -ENOEXEC; } |