]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
arm: ls1021atwr: Do not wrap pci_eth_init() with CONFIG_TSEC_ENET
authorBin Meng <bmeng.cn@gmail.com>
Tue, 12 Jan 2016 06:41:17 +0000 (22:41 -0800)
committerJoe Hershberger <joe.hershberger@ni.com>
Thu, 28 Jan 2016 18:22:44 +0000 (12:22 -0600)
The call to pci_eth_init() should not be wrapped with CONFIG_TSEC_ENET.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
board/freescale/ls1021atwr/ls1021atwr.c

index 8eaff5f0cedf2d2fec4ec254c34c5af93e71f758..f82e567c84fadaf432f8dbfa72ea6ffd19eb29f7 100644 (file)
@@ -243,9 +243,9 @@ int board_mmc_init(bd_t *bis)
 }
 #endif
 
-#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;
@@ -280,10 +280,10 @@ int board_eth_init(bd_t *bis)
        fsl_pq_mdio_init(bis, &mdio_info);
 
        tsec_eth_init(bis, tsec_info, num);
+#endif
 
        return pci_eth_init(bis);
 }
-#endif
 
 #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
 int config_serdes_mux(void)