Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell

- 2 MVEBU related fixes

diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts
index 683dac2a7c18ae599edd51e70d3c1768c19709da..07c7b91175a3939c75340302f984c6f45e92729d 100644 (file)
--- 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 @@
 &eth0 {
        pinctrl-0 = <&pcie_pins>;
        status = "okay";
-       phy-mode = "sgmii";
+       phy-mode = "2500base-x";
+       managed = "in-band-status";
        phy = <&ethphy0>;
-       fixed-link {
-               speed = <1000>;
-               full-duplex;
-       };
 };
 
 &eth1 {
        status = "okay";
-       phy-mode = "sgmii";
+       phy-mode = "2500base-x";
+       managed = "in-band-status";
        phy = <&ethphy1>;
-       fixed-link {
-               speed = <1000>;
-               full-duplex;
-       };
 };
 
 &i2c0 {

diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index dc0ce01c358e2dd059cdde1f9b8e3f9031fd661f..ef53153c46b5ee5b3285d7e4294db853312ea43e 100644 (file)
--- 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;
                        }