Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
- 2 MVEBU related fixes
This commit is contained in:
Tom Rini 2020-05-04 11:05:48 -04:00
commit a1f5f4ac20
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
arch/arm/dts/armada-3720-uDPU.dts
View file

@ -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 {

4
cmd/mvebu/bubt.c
View file

@ -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;
}