projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9fc148e
)
mpc83xx: Don't define cpu_eth_init for DM eth
author
Mario Six
<mario.six@gdsys.cc>
Mon, 21 Jan 2019 08:18:19 +0000
(09:18 +0100)
committer
Mario Six
<mario.six@gdsys.cc>
Tue, 21 May 2019 05:52:33 +0000
(07:52 +0200)
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>
arch/powerpc/cpu/mpc83xx/cpu.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/cpu/mpc83xx/cpu.c
b/arch/powerpc/cpu/mpc83xx/cpu.c
index
8a88068
..
4ea4249
100644
(file)
--- a/
arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/
arch/powerpc/cpu/mpc83xx/cpu.c
@@
-199,6
+199,7
@@
void watchdog_reset (void)
}
#endif
}
#endif
+#ifndef CONFIG_DM_ETH
/*
* Initializes on-chip ethernet controllers.
* to override, implement board_eth_init()
/*
* 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
return 0;
}
+#endif /* !CONFIG_DM_ETH */
/*
* Initializes on-chip MMC controllers.
/*
* Initializes on-chip MMC controllers.