From: Mario Six <mario.six@gdsys.cc>
Date: Mon, 21 Jan 2019 08:18:19 +0000 (+0100)
Subject: mpc83xx: Don't define cpu_eth_init for DM eth
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=8835836ae74d1b340f079ce49c3f1cc810452d0d;p=u-boot.git

mpc83xx: Don't define cpu_eth_init for DM eth

Don't use the legacy method of initializing the ethernet controller on
MPC83xx when DM is active.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
---

diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 8a88068fdb..4ea4249aff 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -199,6 +199,7 @@ void watchdog_reset (void)
 }
 #endif
 
+#ifndef CONFIG_DM_ETH
 /*
  * Initializes on-chip ethernet controllers.
  * to override, implement board_eth_init()
@@ -214,6 +215,7 @@ int cpu_eth_init(bd_t *bis)
 #endif
 	return 0;
 }
+#endif /* !CONFIG_DM_ETH */
 
 /*
  * Initializes on-chip MMC controllers.