summaryrefslogtreecommitdiffstats
path: root/board/freescale/ls1021atwr/ls1021atwr.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-01-28 18:42:10 -0500
committerTom Rini <trini@konsulko.com>2016-01-28 18:42:10 -0500
commit82d72a1b9967cff4908f22c57536c3660f794401 (patch)
treeed7f02df10ffa0f7c4ef87298c1c5e5f4be5dd45 /board/freescale/ls1021atwr/ls1021atwr.c
parent3faf2216d9649e2a22e6728194e9797cb46db933 (diff)
parentb2b7fbc33ff1b990804e481153dd45de579cff75 (diff)
downloadtalos-obmc-uboot-82d72a1b9967cff4908f22c57536c3660f794401.tar.gz
talos-obmc-uboot-82d72a1b9967cff4908f22c57536c3660f794401.zip
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'board/freescale/ls1021atwr/ls1021atwr.c')
-rw-r--r--board/freescale/ls1021atwr/ls1021atwr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index b85774c4a4..616e0bfd39 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -244,9 +244,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;
@@ -281,10 +281,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)
OpenPOWER on IntegriCloud