| Message ID | 20161208163755.23AD6FED0F@linux-xvxi.amer.corp.natinst.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Thu, Dec 08, 2016 at 10:37:26AM -0600, Joe Hershberger wrote: > Hi Tom, > > The following changes since commit 388019f1e2166638453bc4e0cc5d138c2a19e0c9: > > Merge branch 'master' of git://git.denx.de/u-boot-usb (2016-12-06 08:07:20 -0500) > > are available in the git repository at: > > > git://git.denx.de/u-boot-net.git master > > for you to fetch changes up to bb135a0180c31fbd7456021fb9700b49bba7f533: > > net/phy/vitesse: Rework RGMII skew configuration for VSC8601 (2016-12-08 10:36:22 -0600) This is a NAK and is what is breaking microblaze-generic and imgtec_xilfpga at least: +(imgtec_xilfpga,microblaze-generic) ret = mdio_register_seq(emaclite->bus, dev->seq);+(imgtec_xilfpga,microblaze-generic) ^ +(imgtec_xilfpga,microblaze-generic) drivers/net/built-in.o: In function `emaclite_probe': +(imgtec_xilfpga) ../drivers/net/xilinx_emaclite.c:(.text.emaclite_probe+0x64): undefined reference to `mdio_register_seq' +(imgtec_xilfpga,microblaze-generic) make[1]: *** [u-boot] Error 1 +(imgtec_xilfpga,microblaze-generic) make: *** [sub-make] Error 2 +(microblaze-generic) ret = mdio_register_seq(priv->bus, dev->seq); +(microblaze-generic) drivers/net/built-in.o: In function `axi_emac_probe': +(microblaze-generic) build/../drivers/net/xilinx_axi_emac.c:652: undefined reference to `mdio_register_seq' +(microblaze-generic) build/../drivers/net/xilinx_emaclite.c:570: undefined reference to `mdio_register_seq'
Hi Tom, On Fri, Dec 9, 2016 at 6:12 AM, Tom Rini <trini@konsulko.com> wrote: > On Thu, Dec 08, 2016 at 10:37:26AM -0600, Joe Hershberger wrote: > >> Hi Tom, >> >> The following changes since commit 388019f1e2166638453bc4e0cc5d138c2a19e0c9: >> >> Merge branch 'master' of git://git.denx.de/u-boot-usb (2016-12-06 08:07:20 -0500) >> >> are available in the git repository at: >> >> >> git://git.denx.de/u-boot-net.git master >> >> for you to fetch changes up to bb135a0180c31fbd7456021fb9700b49bba7f533: >> >> net/phy/vitesse: Rework RGMII skew configuration for VSC8601 (2016-12-08 10:36:22 -0600) > > This is a NAK and is what is breaking microblaze-generic and > imgtec_xilfpga at least: > +(imgtec_xilfpga,microblaze-generic) ret = > mdio_register_seq(emaclite->bus, dev->seq);+(imgtec_xilfpga,microblaze-generic) ^ > +(imgtec_xilfpga,microblaze-generic) drivers/net/built-in.o: In function > `emaclite_probe': > +(imgtec_xilfpga) > ../drivers/net/xilinx_emaclite.c:(.text.emaclite_probe+0x64): undefined reference to `mdio_register_seq' > +(imgtec_xilfpga,microblaze-generic) make[1]: *** [u-boot] Error 1 > +(imgtec_xilfpga,microblaze-generic) make: *** [sub-make] Error 2 > +(microblaze-generic) ret = mdio_register_seq(priv->bus, dev->seq); > +(microblaze-generic) drivers/net/built-in.o: In function `axi_emac_probe': +(microblaze-generic) > build/../drivers/net/xilinx_axi_emac.c:652: undefined reference to `mdio_register_seq' > +(microblaze-generic) build/../drivers/net/xilinx_emaclite.c:570: undefined reference to `mdio_register_seq' This is strange... I build tested this on Travis. https://travis-ci.org/jhershbe/u-boot/builds/180270329 Are we missing microblaze coverage on Travis or something? Thanks, -Joe > -- > Tom > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot >
Hi Joe, 2016-12-09 17:22 GMT+01:00 Joe Hershberger <joe.hershberger@gmail.com>: > Hi Tom, > > On Fri, Dec 9, 2016 at 6:12 AM, Tom Rini <trini@konsulko.com> wrote: > > On Thu, Dec 08, 2016 at 10:37:26AM -0600, Joe Hershberger wrote: > > > >> Hi Tom, > >> > >> The following changes since commit 388019f1e2166638453bc4e0cc5d13 > 8c2a19e0c9: > >> > >> Merge branch 'master' of git://git.denx.de/u-boot-usb (2016-12-06 > 08:07:20 -0500) > >> > >> are available in the git repository at: > >> > >> > >> git://git.denx.de/u-boot-net.git master > >> > >> for you to fetch changes up to bb135a0180c31fbd7456021fb9700b > 49bba7f533: > >> > >> net/phy/vitesse: Rework RGMII skew configuration for VSC8601 > (2016-12-08 10:36:22 -0600) > > > > This is a NAK and is what is breaking microblaze-generic and > > imgtec_xilfpga at least: > > +(imgtec_xilfpga,microblaze-generic) ret = > > mdio_register_seq(emaclite->bus, dev->seq);+(imgtec_xilfpga,microblaze-generic) > ^ > > +(imgtec_xilfpga,microblaze-generic) drivers/net/built-in.o: In function > > `emaclite_probe': > > +(imgtec_xilfpga) > > ../drivers/net/xilinx_emaclite.c:(.text.emaclite_probe+0x64): undefined > reference to `mdio_register_seq' > > +(imgtec_xilfpga,microblaze-generic) make[1]: *** [u-boot] Error 1 > > +(imgtec_xilfpga,microblaze-generic) make: *** [sub-make] Error 2 > > +(microblaze-generic) ret = mdio_register_seq(priv->bus, dev->seq); > > +(microblaze-generic) drivers/net/built-in.o: In function > `axi_emac_probe': +(microblaze-generic) > > build/../drivers/net/xilinx_axi_emac.c:652: undefined reference to > `mdio_register_seq' > > +(microblaze-generic) build/../drivers/net/xilinx_emaclite.c:570: > undefined reference to `mdio_register_seq' > > This is strange... I build tested this on Travis. > > https://travis-ci.org/jhershbe/u-boot/builds/180270329 > > Are we missing microblaze coverage on Travis or something? > This patches went to the tree by accident. Tom reverted that incorrect merge. Adding mdio_register_seq was sent recently for review and it shouldn't have these compilation issue. I have no idea what's wrong with imgtec_xilfpga. And microblaze should be covered by travis already. Thanks, Michal
On Fri, Dec 9, 2016 at 11:43 AM, Michal Simek <monstr@monstr.eu> wrote: > Hi Joe, > > 2016-12-09 17:22 GMT+01:00 Joe Hershberger <joe.hershberger@gmail.com>: >> >> Hi Tom, >> >> On Fri, Dec 9, 2016 at 6:12 AM, Tom Rini <trini@konsulko.com> wrote: >> > On Thu, Dec 08, 2016 at 10:37:26AM -0600, Joe Hershberger wrote: >> > >> >> Hi Tom, >> >> >> >> The following changes since commit >> >> 388019f1e2166638453bc4e0cc5d138c2a19e0c9: >> >> >> >> Merge branch 'master' of git://git.denx.de/u-boot-usb (2016-12-06 >> >> 08:07:20 -0500) >> >> >> >> are available in the git repository at: >> >> >> >> >> >> git://git.denx.de/u-boot-net.git master >> >> >> >> for you to fetch changes up to >> >> bb135a0180c31fbd7456021fb9700b49bba7f533: >> >> >> >> net/phy/vitesse: Rework RGMII skew configuration for VSC8601 >> >> (2016-12-08 10:36:22 -0600) >> > >> > This is a NAK and is what is breaking microblaze-generic and >> > imgtec_xilfpga at least: Uhh... so it's not a NAK? This PR seems to be in your master. I've rebased and have no commits left on top of your master. I've pushed it for travis as another test anyway. https://travis-ci.org/jhershbe/u-boot/builds/182680490 >> > +(imgtec_xilfpga,microblaze-generic) ret = >> > mdio_register_seq(emaclite->bus, >> > dev->seq);+(imgtec_xilfpga,microblaze-generic) ^ >> > +(imgtec_xilfpga,microblaze-generic) drivers/net/built-in.o: In function >> > `emaclite_probe': >> > +(imgtec_xilfpga) >> > ../drivers/net/xilinx_emaclite.c:(.text.emaclite_probe+0x64): undefined >> > reference to `mdio_register_seq' >> > +(imgtec_xilfpga,microblaze-generic) make[1]: *** [u-boot] Error 1 >> > +(imgtec_xilfpga,microblaze-generic) make: *** [sub-make] Error 2 >> > +(microblaze-generic) ret = mdio_register_seq(priv->bus, dev->seq); >> > +(microblaze-generic) drivers/net/built-in.o: In function >> > `axi_emac_probe': +(microblaze-generic) >> > build/../drivers/net/xilinx_axi_emac.c:652: undefined reference to >> > `mdio_register_seq' >> > +(microblaze-generic) build/../drivers/net/xilinx_emaclite.c:570: >> > undefined reference to `mdio_register_seq' >> >> This is strange... I build tested this on Travis. >> >> https://travis-ci.org/jhershbe/u-boot/builds/180270329 >> >> Are we missing microblaze coverage on Travis or something? > > > > This patches went to the tree by accident. Tom reverted that incorrect > merge. > Adding mdio_register_seq was sent recently for review and it shouldn't have > these compilation issue. > I have no idea what's wrong with imgtec_xilfpga. > And microblaze should be covered by travis already. > > Thanks, > Michal > > -- > Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 > w: www.monstr.eu p: +42-0-721842854 > Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ > Maintainer of Linux kernel - Xilinx Zynq ARM architecture > Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
Hi Joe, 2016-12-09 19:35 GMT+01:00 Joe Hershberger <joe.hershberger@gmail.com>: > On Fri, Dec 9, 2016 at 11:43 AM, Michal Simek <monstr@monstr.eu> wrote: > > Hi Joe, > > > > 2016-12-09 17:22 GMT+01:00 Joe Hershberger <joe.hershberger@gmail.com>: > >> > >> Hi Tom, > >> > >> On Fri, Dec 9, 2016 at 6:12 AM, Tom Rini <trini@konsulko.com> wrote: > >> > On Thu, Dec 08, 2016 at 10:37:26AM -0600, Joe Hershberger wrote: > >> > > >> >> Hi Tom, > >> >> > >> >> The following changes since commit > >> >> 388019f1e2166638453bc4e0cc5d138c2a19e0c9: > >> >> > >> >> Merge branch 'master' of git://git.denx.de/u-boot-usb (2016-12-06 > >> >> 08:07:20 -0500) > >> >> > >> >> are available in the git repository at: > >> >> > >> >> > >> >> git://git.denx.de/u-boot-net.git master > >> >> > >> >> for you to fetch changes up to > >> >> bb135a0180c31fbd7456021fb9700b49bba7f533: > >> >> > >> >> net/phy/vitesse: Rework RGMII skew configuration for VSC8601 > >> >> (2016-12-08 10:36:22 -0600) > >> > > >> > This is a NAK and is what is breaking microblaze-generic and > >> > imgtec_xilfpga at least: > > Uhh... so it's not a NAK? This PR seems to be in your master. > > I've rebased and have no commits left on top of your master. I've > pushed it for travis as another test anyway. > https://travis-ci.org/jhershbe/u-boot/builds/182680490 > > >> > +(imgtec_xilfpga,microblaze-generic) ret = > >> > mdio_register_seq(emaclite->bus, > >> > dev->seq);+(imgtec_xilfpga,microblaze-generic) ^ > >> > +(imgtec_xilfpga,microblaze-generic) drivers/net/built-in.o: In > function > >> > `emaclite_probe': > >> > +(imgtec_xilfpga) > >> > ../drivers/net/xilinx_emaclite.c:(.text.emaclite_probe+0x64): > undefined > >> > reference to `mdio_register_seq' > >> > +(imgtec_xilfpga,microblaze-generic) make[1]: *** [u-boot] Error 1 > >> > +(imgtec_xilfpga,microblaze-generic) make: *** [sub-make] Error 2 > >> > +(microblaze-generic) ret = mdio_register_seq(priv->bus, dev->seq); > >> > +(microblaze-generic) drivers/net/built-in.o: In function > >> > `axi_emac_probe': +(microblaze-generic) > >> > build/../drivers/net/xilinx_axi_emac.c:652: undefined reference to > >> > `mdio_register_seq' > >> > +(microblaze-generic) build/../drivers/net/xilinx_emaclite.c:570: > >> > undefined reference to `mdio_register_seq' > >> > >> This is strange... I build tested this on Travis. > >> > >> https://travis-ci.org/jhershbe/u-boot/builds/180270329 > >> > >> Are we missing microblaze coverage on Travis or something? > > > > > > > > This patches went to the tree by accident. Tom reverted that incorrect > > merge. > > Adding mdio_register_seq was sent recently for review and it shouldn't > have > > these compilation issue. > > I have no idea what's wrong with imgtec_xilfpga. > > And microblaze should be covered by travis already. > I have some patches in master but nothing what is ready for merge. And Tom lost one email that he merged something what I didn't ask for. Anyway I think it is good reason start to use pull request based on tags not on branches. Thanks, Michal
On Fri, Dec 09, 2016 at 12:35:59PM -0600, Joe Hershberger wrote: > On Fri, Dec 9, 2016 at 11:43 AM, Michal Simek <monstr@monstr.eu> wrote: > > Hi Joe, > > > > 2016-12-09 17:22 GMT+01:00 Joe Hershberger <joe.hershberger@gmail.com>: > >> > >> Hi Tom, > >> > >> On Fri, Dec 9, 2016 at 6:12 AM, Tom Rini <trini@konsulko.com> wrote: > >> > On Thu, Dec 08, 2016 at 10:37:26AM -0600, Joe Hershberger wrote: > >> > > >> >> Hi Tom, > >> >> > >> >> The following changes since commit > >> >> 388019f1e2166638453bc4e0cc5d138c2a19e0c9: > >> >> > >> >> Merge branch 'master' of git://git.denx.de/u-boot-usb (2016-12-06 > >> >> 08:07:20 -0500) > >> >> > >> >> are available in the git repository at: > >> >> > >> >> > >> >> git://git.denx.de/u-boot-net.git master > >> >> > >> >> for you to fetch changes up to > >> >> bb135a0180c31fbd7456021fb9700b49bba7f533: > >> >> > >> >> net/phy/vitesse: Rework RGMII skew configuration for VSC8601 > >> >> (2016-12-08 10:36:22 -0600) > >> > > >> > This is a NAK and is what is breaking microblaze-generic and > >> > imgtec_xilfpga at least: > > Uhh... so it's not a NAK? This PR seems to be in your master. > > I've rebased and have no commits left on top of your master. I've > pushed it for travis as another test anyway. > https://travis-ci.org/jhershbe/u-boot/builds/182680490 OK, thanks. I messed things up slightly but I think we're all good now, thanks for checking.
Hi Tom, The following changes since commit 388019f1e2166638453bc4e0cc5d138c2a19e0c9: Merge branch 'master' of git://git.denx.de/u-boot-usb (2016-12-06 08:07:20 -0500) are available in the git repository at: git://git.denx.de/u-boot-net.git master for you to fetch changes up to bb135a0180c31fbd7456021fb9700b49bba7f533: net/phy/vitesse: Rework RGMII skew configuration for VSC8601 (2016-12-08 10:36:22 -0600) ---------------------------------------------------------------- Alex (1): net/phy/vitesse: Rework RGMII skew configuration for VSC8601 Marek Vasut (1): net: phy: micrel: Fix error handling Stefan Roese (1): net: usb: r8152: Use ALLOC_CACHE_ALIGN_BUFFER() to allocate the buffers oliver@schinagl.nl (3): net: phy: realtek: Use the BIT() macro net: phy: realtek: make define more consistent net: phy: realtek: Only force master mode on rtl8211b/c shaohui xie (1): net: fman: fix 2.5G SGMII settings drivers/net/fm/eth.c | 33 +++++++++++++++++++++++---------- drivers/net/fm/memac.c | 1 + drivers/net/phy/micrel.c | 6 ++++-- drivers/net/phy/realtek.c | 36 ++++++++++++++++++++++++++---------- drivers/net/phy/vitesse.c | 43 ++++++++++++++++++++++++------------------- drivers/usb/eth/r8152.c | 22 ++++++++++++++++------ include/fsl_memac.h | 1 + 7 files changed, 95 insertions(+), 47 deletions(-) Thanks! -Joe