| Message ID | 1452580888-27637-2-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | 89c97842dbbc053535f0d9b2cc2e7987c09d2946 |
| Delegated to: | Joe Hershberger |
| Headers | show |
Hi Bin, On Tue, Jan 12, 2016 at 12:41 AM, Bin Meng <bmeng.cn@gmail.com> wrote: > The call to pci_eth_init() should not be wrapped with CONFIG_TSEC_ENET. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > board/freescale/bsc9132qds/bsc9132qds.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/board/freescale/bsc9132qds/bsc9132qds.c b/board/freescale/bsc9132qds/bsc9132qds.c > index 586dacc..71a7bb5 100644 > --- a/board/freescale/bsc9132qds/bsc9132qds.c > +++ b/board/freescale/bsc9132qds/bsc9132qds.c > @@ -227,9 +227,9 @@ int checkboard(void) > return 0; > } > > -#ifdef CONFIG_TSEC_ENET > int board_eth_init(bd_t *bis) > { > +#ifdef CONFIG_TSEC_ENET > struct fsl_pq_mdio_info mdio_info; > struct tsec_info_struct tsec_info[4]; > int num = 0; > @@ -250,6 +250,7 @@ int board_eth_init(bd_t *bis) > > fsl_pq_mdio_init(bis, &mdio_info); > tsec_eth_init(bis, tsec_info, num); > +#endif > > #ifdef CONFIG_PCI > pci_eth_init(bis); This is still needed even with what Stephen Warren and Simon Glass are discussing here, right? If so... Acked-by: Joe Hershberger <joe.hershberger@ni.com> > @@ -257,7 +258,6 @@ int board_eth_init(bd_t *bis) > > return 0; > } > -#endif > > #define USBMUX_SEL_MASK 0xc0 > #define USBMUX_SEL_UART2 0xc0 > -- > 1.8.2.1 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot
Hi Bin, https://patchwork.ozlabs.org/patch/566334/ was applied to u-boot-net.git. Thanks! -Joe
diff --git a/board/freescale/bsc9132qds/bsc9132qds.c b/board/freescale/bsc9132qds/bsc9132qds.c index 586dacc..71a7bb5 100644 --- a/board/freescale/bsc9132qds/bsc9132qds.c +++ b/board/freescale/bsc9132qds/bsc9132qds.c @@ -227,9 +227,9 @@ int checkboard(void) return 0; } -#ifdef CONFIG_TSEC_ENET int board_eth_init(bd_t *bis) { +#ifdef CONFIG_TSEC_ENET struct fsl_pq_mdio_info mdio_info; struct tsec_info_struct tsec_info[4]; int num = 0; @@ -250,6 +250,7 @@ int board_eth_init(bd_t *bis) fsl_pq_mdio_init(bis, &mdio_info); tsec_eth_init(bis, tsec_info, num); +#endif #ifdef CONFIG_PCI pci_eth_init(bis); @@ -257,7 +258,6 @@ int board_eth_init(bd_t *bis) return 0; } -#endif #define USBMUX_SEL_MASK 0xc0 #define USBMUX_SEL_UART2 0xc0
The call to pci_eth_init() should not be wrapped with CONFIG_TSEC_ENET. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- board/freescale/bsc9132qds/bsc9132qds.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)