]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
powerpc: mpc8548cds: Do not wrap pci_eth_init() with CONFIG_TSEC_ENET
authorBin Meng <bmeng.cn@gmail.com>
Tue, 12 Jan 2016 06:41:15 +0000 (22:41 -0800)
committerJoe Hershberger <joe.hershberger@ni.com>
Thu, 28 Jan 2016 18:22:37 +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/mpc8548cds/mpc8548cds.c

index ca9b43c6b621ff3a18fcb8d39b9f9882cb6bf7fd..de76d36174a06a41d7812a4996aeecd1ea014732 100644 (file)
@@ -301,9 +301,9 @@ void configure_rgmii(void)
        return;
 }
 
-#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;
@@ -345,10 +345,10 @@ int board_eth_init(bd_t *bis)
 
        tsec_eth_init(bis, tsec_info, num);
        configure_rgmii();
+#endif
 
        return pci_eth_init(bis);
 }
-#endif
 
 #if defined(CONFIG_OF_BOARD_SETUP)
 void ft_pci_setup(void *blob, bd_t *bd)