[U-Boot] Pull request: u-boot-net.git master
Hi Tom,
Tested as https://travis-ci.org/jhershbe/u-boot/builds/445352605
The following changes since commit 1ed3c0954bd160dafcad8847a51c3ddd5f992f51:
Merge branch 'master' of git://git.denx.de/u-boot-samsung (2018-10-23 21:13:32 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-net.git master
for you to fetch changes up to 58ec4d3342f4ffd195f3f3f2e570f772500c6ecb:
net: fec_mxc: add support for i.MX8X (2018-10-24 14:45:38 -0500)
---------------------------------------------------------------- Anatolij Gustschin (1): net: fec_mxc: add support for i.MX8X
Baruch Siach (2): net: mvpp2: fix polarity of PHY reset signal net: mvpp2: increase PHY reset pulse
Hector Palacios (1): cmd: mii: don't check address for 'device' subcommand
Jeremy Gebben (3): configs: migrate CONFIG_PHY_AQUANTIA to Kconfig net: phy: aquantia: add firmware loading support net: phy: aquantia: autodetect if firmware needs to be loaded
Martin Fuzzey (4): net: dm: fec: Fix time unit error in phy-reset-duration net: dm: fec: Fix phy-reset-duration clamping and defaults net: dm: fec: Support the phy-supply binding net: dm: fec: Obtain the transceiver type from the DT
Pankaj Bansal (1): miiphy: Add function to retrieve MDIO bus list head
Priyanka Jain (1): net/phy: Add phy-id for IN112525_S03
cmd/mii.c | 2 +- common/miiphyutil.c | 5 + configs/T1023RDB_NAND_defconfig | 2 +- configs/T1023RDB_SDCARD_defconfig | 2 +- configs/T1023RDB_SECURE_BOOT_defconfig | 2 +- configs/T1023RDB_SPIFLASH_defconfig | 2 +- configs/T1023RDB_defconfig | 2 +- configs/T1024RDB_NAND_defconfig | 2 +- configs/T1024RDB_SDCARD_defconfig | 2 +- configs/T1024RDB_SECURE_BOOT_defconfig | 2 +- configs/T1024RDB_SPIFLASH_defconfig | 2 +- configs/T1024RDB_defconfig | 2 +- configs/T2080QDS_NAND_defconfig | 2 +- configs/T2080QDS_SDCARD_defconfig | 2 +- configs/T2080QDS_SECURE_BOOT_defconfig | 2 +- configs/T2080QDS_SPIFLASH_defconfig | 2 +- configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 2 +- configs/T2080QDS_defconfig | 2 +- configs/T2080RDB_NAND_defconfig | 2 +- configs/T2080RDB_SDCARD_defconfig | 2 +- configs/T2080RDB_SECURE_BOOT_defconfig | 2 +- configs/T2080RDB_SPIFLASH_defconfig | 2 +- configs/T2080RDB_SRIO_PCIE_BOOT_defconfig | 2 +- configs/T2080RDB_defconfig | 2 +- configs/T2081QDS_NAND_defconfig | 2 +- configs/T2081QDS_SDCARD_defconfig | 2 +- configs/T2081QDS_SPIFLASH_defconfig | 2 +- configs/T2081QDS_SRIO_PCIE_BOOT_defconfig | 2 +- configs/T2081QDS_defconfig | 2 +- configs/ls1043ardb_defconfig | 2 +- configs/ls1043ardb_nand_SECURE_BOOT_defconfig | 2 +- configs/ls1043ardb_nand_defconfig | 2 +- configs/ls1043ardb_sdcard_defconfig | 2 +- configs/ls1046ardb_emmc_defconfig | 2 +- configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 2 +- configs/ls1046ardb_qspi_defconfig | 2 +- configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 2 +- configs/ls1046ardb_sdcard_defconfig | 2 +- configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_qspi_defconfig | 1 + .../ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_sdcard_qspi_defconfig | 1 + configs/ls2080ardb_SECURE_BOOT_defconfig | 2 +- configs/ls2080ardb_defconfig | 2 +- configs/ls2080ardb_nand_defconfig | 2 +- configs/ls2081ardb_defconfig | 2 +- configs/ls2088ardb_qspi_SECURE_BOOT_defconfig | 2 +- configs/ls2088ardb_qspi_defconfig | 2 +- drivers/net/Kconfig | 2 +- drivers/net/fec_mxc.c | 121 ++++++++-- drivers/net/fec_mxc.h | 7 + drivers/net/mvpp2.c | 4 +- drivers/net/phy/Kconfig | 26 ++- drivers/net/phy/aquantia.c | 254 ++++++++++++++++++++- include/configs/T102xRDB.h | 2 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 2 - include/configs/ls1043ardb.h | 2 - include/configs/ls1046ardb.h | 2 - include/configs/ls1088ardb.h | 3 - include/configs/ls2080ardb.h | 3 - include/miiphy.h | 1 + include/phy.h | 7 +- 63 files changed, 446 insertions(+), 86 deletions(-)
Thanks! -Joe
On Wed, Oct 24, 2018 at 02:45:53PM -0500, Joe Hershberger wrote:
Hi Tom,
Tested as https://travis-ci.org/jhershbe/u-boot/builds/445352605
The following changes since commit 1ed3c0954bd160dafcad8847a51c3ddd5f992f51:
Merge branch 'master' of git://git.denx.de/u-boot-samsung (2018-10-23 21:13:32 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-net.git master
for you to fetch changes up to 58ec4d3342f4ffd195f3f3f2e570f772500c6ecb:
net: fec_mxc: add support for i.MX8X (2018-10-24 14:45:38 -0500)
Anatolij Gustschin (1): net: fec_mxc: add support for i.MX8X
Baruch Siach (2): net: mvpp2: fix polarity of PHY reset signal net: mvpp2: increase PHY reset pulse
Hector Palacios (1): cmd: mii: don't check address for 'device' subcommand
Jeremy Gebben (3): configs: migrate CONFIG_PHY_AQUANTIA to Kconfig net: phy: aquantia: add firmware loading support net: phy: aquantia: autodetect if firmware needs to be loaded
Martin Fuzzey (4): net: dm: fec: Fix time unit error in phy-reset-duration net: dm: fec: Fix phy-reset-duration clamping and defaults net: dm: fec: Support the phy-supply binding net: dm: fec: Obtain the transceiver type from the DT
Pankaj Bansal (1): miiphy: Add function to retrieve MDIO bus list head
Priyanka Jain (1): net/phy: Add phy-id for IN112525_S03
This passed travis at the time, but now it fails on vf610twr for me: https://travis-ci.org/trini/u-boot/jobs/446449322 so I've cc'd Alison if there's anything we can easily turn off in the defconfig. But I'm also cc'ing York since I thought I saw Alison say they didn't have the board anymore? Should we mark it orphan? Drop it from CI for now and fully soon? Or does someone else want to take it?
Hi Tom,
On 26/10/18 13:52, Tom Rini wrote:
On Wed, Oct 24, 2018 at 02:45:53PM -0500, Joe Hershberger wrote:
Hi Tom,
Tested as https://travis-ci.org/jhershbe/u-boot/builds/445352605
The following changes since commit 1ed3c0954bd160dafcad8847a51c3ddd5f992f51:
Merge branch 'master' of git://git.denx.de/u-boot-samsung (2018-10-23 21:13:32 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-net.git master
for you to fetch changes up to 58ec4d3342f4ffd195f3f3f2e570f772500c6ecb:
net: fec_mxc: add support for i.MX8X (2018-10-24 14:45:38 -0500)
Anatolij Gustschin (1): net: fec_mxc: add support for i.MX8X
Baruch Siach (2): net: mvpp2: fix polarity of PHY reset signal net: mvpp2: increase PHY reset pulse
Hector Palacios (1): cmd: mii: don't check address for 'device' subcommand
Jeremy Gebben (3): configs: migrate CONFIG_PHY_AQUANTIA to Kconfig net: phy: aquantia: add firmware loading support net: phy: aquantia: autodetect if firmware needs to be loaded
Martin Fuzzey (4): net: dm: fec: Fix time unit error in phy-reset-duration net: dm: fec: Fix phy-reset-duration clamping and defaults net: dm: fec: Support the phy-supply binding net: dm: fec: Obtain the transceiver type from the DT
Pankaj Bansal (1): miiphy: Add function to retrieve MDIO bus list head
Priyanka Jain (1): net/phy: Add phy-id for IN112525_S03
This passed travis at the time, but now it fails on vf610twr for me: https://travis-ci.org/trini/u-boot/jobs/446449322 so I've cc'd Alison if there's anything we can easily turn off in the defconfig. But I'm also cc'ing York since I thought I saw Alison say they didn't have the board anymore? Should we mark it orphan? Drop it from CI for now and fully soon? Or does someone else want to take it?
I saw for a while the same error, and I saw that for colibry_vf helped to switch on CONFIG_SYS_THUMB_BUILD. But if there is nobody to test it, it is just a fix for the build...
Regards, Stefano
On Fri, Oct 26, 2018 at 02:24:02PM +0200, Stefano Babic wrote:
Hi Tom,
On 26/10/18 13:52, Tom Rini wrote:
On Wed, Oct 24, 2018 at 02:45:53PM -0500, Joe Hershberger wrote:
Hi Tom,
Tested as https://travis-ci.org/jhershbe/u-boot/builds/445352605
The following changes since commit 1ed3c0954bd160dafcad8847a51c3ddd5f992f51:
Merge branch 'master' of git://git.denx.de/u-boot-samsung (2018-10-23 21:13:32 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-net.git master
for you to fetch changes up to 58ec4d3342f4ffd195f3f3f2e570f772500c6ecb:
net: fec_mxc: add support for i.MX8X (2018-10-24 14:45:38 -0500)
Anatolij Gustschin (1): net: fec_mxc: add support for i.MX8X
Baruch Siach (2): net: mvpp2: fix polarity of PHY reset signal net: mvpp2: increase PHY reset pulse
Hector Palacios (1): cmd: mii: don't check address for 'device' subcommand
Jeremy Gebben (3): configs: migrate CONFIG_PHY_AQUANTIA to Kconfig net: phy: aquantia: add firmware loading support net: phy: aquantia: autodetect if firmware needs to be loaded
Martin Fuzzey (4): net: dm: fec: Fix time unit error in phy-reset-duration net: dm: fec: Fix phy-reset-duration clamping and defaults net: dm: fec: Support the phy-supply binding net: dm: fec: Obtain the transceiver type from the DT
Pankaj Bansal (1): miiphy: Add function to retrieve MDIO bus list head
Priyanka Jain (1): net/phy: Add phy-id for IN112525_S03
This passed travis at the time, but now it fails on vf610twr for me: https://travis-ci.org/trini/u-boot/jobs/446449322 so I've cc'd Alison if there's anything we can easily turn off in the defconfig. But I'm also cc'ing York since I thought I saw Alison say they didn't have the board anymore? Should we mark it orphan? Drop it from CI for now and fully soon? Or does someone else want to take it?
I saw for a while the same error, and I saw that for colibry_vf helped to switch on CONFIG_SYS_THUMB_BUILD. But if there is nobody to test it, it is just a fix for the build...
Ah, yeah, we should just turn that on then, thanks.
On Fri, 26 Oct 2018 07:52:50 -0400 Tom Rini trini@konsulko.com wrote: ...
This passed travis at the time, but now it fails on vf610twr for me: https://travis-ci.org/trini/u-boot/jobs/446449322 so I've cc'd Alison if there's anything we can easily turn off in the defconfig. But I'm also cc'ing York since I thought I saw Alison say they didn't have the board anymore? Should we mark it orphan? Drop it from CI for now and fully soon? Or does someone else want to take it?
I've seen this too when build-testing i.MX8 patches, it is the impact of recent drivers growth after extensions for i.MX8. Below is a raw patch I tried to reduce the size for VF610 (not finished yet). Would something like that be acceptable?
CMD_MEMTEST could be dropped from defconfig, the board would be bootable without it.
Thanks,
Anatolij
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 9999d9fe5e..1dae2dfa14 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -943,8 +943,11 @@ static const struct dm_i2c_ops mxc_i2c_ops = { };
static const struct udevice_id mxc_i2c_ids[] = { - { .compatible = "fsl,imx21-i2c", }, +#if defined(CONFIG_ARCH_VF610) { .compatible = "fsl,vf610-i2c", .data = I2C_QUIRK_FLAG, }, +#else + { .compatible = "fsl,imx21-i2c", }, +#endif {} };
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index 6106c1f9ec..c4be872d28 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -227,6 +227,7 @@ static int _lpuart_serial_init(struct udevice *dev) return 0; }
+#if defined(CONFIG_ARCH_MX7) || defined(CONFIG_ARCH_IMX8) static void _lpuart32_serial_setbrg_7ulp(struct udevice *dev, int baudrate) { @@ -295,6 +296,10 @@ static void _lpuart32_serial_setbrg_7ulp(struct udevice *dev,
out_le32(&base->baud, tmp); } +#else +static inline void _lpuart32_serial_setbrg_7ulp(struct udevice *dev, + int baudrate) { } +#endif
static void _lpuart32_serial_setbrg(struct udevice *dev, int baudrate) @@ -502,14 +507,19 @@ static int lpuart_serial_ofdata_to_platdata(struct udevice *dev) plat->reg = (void *)addr; plat->flags = dev_get_driver_data(dev);
- if (!fdt_node_check_compatible(blob, node, "fsl,ls1021a-lpuart")) - plat->devtype = DEV_LS1021A; - else if (!fdt_node_check_compatible(blob, node, "fsl,imx7ulp-lpuart")) +#if defined(CONFIG_ARCH_MX7) + if (!fdt_node_check_compatible(blob, node, "fsl,imx7ulp-lpuart")) plat->devtype = DEV_MX7ULP; - else if (!fdt_node_check_compatible(blob, node, "fsl,vf610-lpuart")) +#elif defined(CONFIG_ARCH_VF610) + if (!fdt_node_check_compatible(blob, node, "fsl,vf610-lpuart")) plat->devtype = DEV_VF610; - else if (!fdt_node_check_compatible(blob, node, "fsl,imx8qm-lpuart")) +#elif defined(CONFIG_ARCH_IMX8) + if (!fdt_node_check_compatible(blob, node, "fsl,imx8qm-lpuart")) plat->devtype = DEV_IMX8; +#else + if (!fdt_node_check_compatible(blob, node, "fsl,ls1021a-lpuart")) + plat->devtype = DEV_LS1021A; +#endif
return 0; } @@ -522,13 +532,18 @@ static const struct dm_serial_ops lpuart_serial_ops = { };
static const struct udevice_id lpuart_serial_ids[] = { - { .compatible = "fsl,ls1021a-lpuart", .data = - LPUART_FLAG_REGMAP_32BIT_REG | LPUART_FLAG_REGMAP_ENDIAN_BIG }, +#if defined(CONFIG_ARCH_MX7) { .compatible = "fsl,imx7ulp-lpuart", .data = LPUART_FLAG_REGMAP_32BIT_REG }, +#elif defined(CONFIG_ARCH_VF610) { .compatible = "fsl,vf610-lpuart"}, +#elif defined(CONFIG_ARCH_IMX8) { .compatible = "fsl,imx8qm-lpuart", .data = LPUART_FLAG_REGMAP_32BIT_REG }, +#else + { .compatible = "fsl,ls1021a-lpuart", .data = + LPUART_FLAG_REGMAP_32BIT_REG | LPUART_FLAG_REGMAP_ENDIAN_BIG }, +#endif { } };
On 10/26/18 04:52, Tom Rini wrote: <snip>
This passed travis at the time, but now it fails on vf610twr for me: https://travis-ci.org/trini/u-boot/jobs/446449322 so I've cc'd Alison if there's anything we can easily turn off in the defconfig. But I'm also cc'ing York since I thought I saw Alison say they didn't have the board anymore? Should we mark it orphan? Drop it from CI for now and fully soon? Or does someone else want to take it?
Alison,
I don't see vf610twr anywhere. Can you find out if this board is still shipping or actively being used?
York
On Wed, Oct 24, 2018 at 02:45:53PM -0500, Joe Hershberger wrote:
Hi Tom,
Tested as https://travis-ci.org/jhershbe/u-boot/builds/445352605
The following changes since commit 1ed3c0954bd160dafcad8847a51c3ddd5f992f51:
Merge branch 'master' of git://git.denx.de/u-boot-samsung (2018-10-23 21:13:32 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-net.git master
for you to fetch changes up to 58ec4d3342f4ffd195f3f3f2e570f772500c6ecb:
net: fec_mxc: add support for i.MX8X (2018-10-24 14:45:38 -0500)
Applied to u-boot/master, thanks!
participants (5)
-
Anatolij Gustschin -
Joe Hershberger -
Stefano Babic -
Tom Rini -
York Sun