vhaudiquet/u-boot-krane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'u-boot-imx-next-20240925' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx into next

Browse Source 
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/22406

- i.MX93 FEC fixes.
- Always name the generated fitImage u-boot.itb to keep compatibility
  with pr-buildman behavior.
-----------------------
This commit is contained in:
Tom Rini
2024-09-25 08:21:40 -06:00
parent 2add54d496 99abeaa648
commit 49e3b574ed
5 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/dts/imx8mm-u-boot.dtsi
+1
View File
@@ -122,6 +122,7 @@
binman_imx_fit: fit {
description = "Configuration to load ATF before U-Boot";
filename = "u-boot.itb";
#ifndef CONFIG_IMX_HAB
fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
#endif
arch/arm/dts/imx8mn-u-boot.dtsi
+1
View File
@@ -193,6 +193,7 @@
binman_imx_fit: fit {
description = "Configuration to load ATF before U-Boot";
filename = "u-boot.itb";
#ifndef CONFIG_IMX_HAB
fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
#endif
arch/arm/dts/imx8mp-u-boot.dtsi
+1
View File
@@ -148,6 +148,7 @@
binman_imx_fit: fit {
description = "Configuration to load ATF before U-Boot";
filename = "u-boot.itb";
#ifndef CONFIG_IMX_HAB
fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
#endif
arch/arm/dts/imx8mq-u-boot.dtsi
+1
View File
@@ -106,6 +106,7 @@
binman_imx_fit: fit {
description = "Configuration to load ATF before U-Boot";
filename = "u-boot.itb";
#ifndef CONFIG_IMX_HAB
fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
#endif
drivers/net/fec_mxc.c
+8 -2
View File
@@ -817,6 +817,9 @@ static int fecmxc_recv(struct udevice *dev, int flags, uchar **packetp)
return -ENOMEM;
}
if (!(readl(&fec->eth->ecntrl) & FEC_ECNTRL_ETHER_EN))
return 0;
/* Check if any critical events have happened */
ievent = readl(&fec->eth->ievent);
writel(ievent, &fec->eth->ievent);
@@ -1209,10 +1212,13 @@ static int fecmxc_set_ref_clk(struct clk *clk_ref, phy_interface_t interface)
else if (interface == PHY_INTERFACE_MODE_RGMII ||
interface == PHY_INTERFACE_MODE_RGMII_ID ||
interface == PHY_INTERFACE_MODE_RGMII_RXID ||
interface == PHY_INTERFACE_MODE_RGMII_TXID)
interface == PHY_INTERFACE_MODE_RGMII_TXID) {
freq = 125000000;
else
if (is_imx93())
freq = freq << 1;
} else {
return -EINVAL;
}
ret = clk_set_rate(clk_ref, freq);
if (ret < 0)