summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-01-17 14:51:56 -0700
committerJoe Hershberger <joe.hershberger@ni.com>2016-01-28 12:32:45 -0600
commitc32a6fd07b1839e4a45729587ebc8e1c55601a4d (patch)
tree29b17ac2ae6aed2d2e1576e0f60767167304604d
parentdfa71e9fcbb142d3cf253054f83e4a4b4ea63f94 (diff)
downloadu-boot-c32a6fd07b1839e4a45729587ebc8e1c55601a4d.tar.gz
u-boot-c32a6fd07b1839e4a45729587ebc8e1c55601a4d.tar.xz
u-boot-c32a6fd07b1839e4a45729587ebc8e1c55601a4d.zip
net: Don't call board/cpu_eth_init() with driver model
We should avoid weak functions with driver model. Existing boards that use driver model don't need them, so let's kill them off. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
-rw-r--r--net/eth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/eth.c b/net/eth.c
index 45fe6e3c1c..d96d3a5f45 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -96,6 +96,7 @@ static void eth_common_init(void)
phy_init();
#endif
+#ifndef CONFIG_DM_ETH
/*
* If board-specific initialization exists, call it.
* If not, call a CPU-specific one
@@ -107,10 +108,9 @@ static void eth_common_init(void)
if (cpu_eth_init(gd->bd) < 0)
printf("CPU Net Initialization Failed\n");
} else {
-#ifndef CONFIG_DM_ETH
printf("Net Initialization Skipped\n");
-#endif
}
+#endif
}
#ifdef CONFIG_DM_ETH