From c32a6fd07b1839e4a45729587ebc8e1c55601a4d Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 17 Jan 2016 14:51:56 -0700 Subject: [PATCH] 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 Reviewed-by: Bin Meng Acked-by: Joe Hershberger --- net/eth.c | 4 ++-- 1 file 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 -- 2.30.2