From: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Date: Thu, 27 Sep 2012 10:28:09 +0000 (+0000)
Subject: mx25: Define cpu_eth_init() only if needed
X-Git-Tag: v2013.01-rc1~189
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f7542638c7ad3e2b98163f4b95a6d6f268c13a8b;p=oweals%2Fu-boot.git

mx25: Define cpu_eth_init() only if needed

The FEC is the only SoC Ethernet support available on i.MX25, so define
cpu_eth_init() only for it instead of returning a misleading success code.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Cc: Stefano Babic <sbabic@denx.de>
---

diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index e3b3d504a9..7cfa66f669 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -209,9 +209,13 @@ void enable_caches(void)
 #endif
 }
 
+#if defined(CONFIG_FEC_MXC)
+/*
+ * Initializes on-chip ethernet controllers.
+ * to override, implement board_eth_init()
+ */
 int cpu_eth_init(bd_t *bis)
 {
-#if defined(CONFIG_FEC_MXC)
 	struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
 	ulong val;
 
@@ -219,10 +223,8 @@ int cpu_eth_init(bd_t *bis)
 	val |= (1 << 23);
 	writel(val, &ccm->cgr0);
 	return fecmxc_initialize(bis);
-#else
-	return 0;
-#endif
 }
+#endif
 
 int get_clocks(void)
 {