m68knommu: clean up init code in ColdFire 523x startup

We can move the QSPI init call to the more general config_BSP() code on
the 523x platorm setup code. Then we can remove the initcall code all
together.

We can also remove the un-needed include of mcfuart.h while we are
cleaning up here too.

Also I noticed that we are not calling the fec_init() code here, and we
should be doing that. Put that back in too.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>

diff --git a/arch/m68k/platform/523x/config.c b/arch/m68k/platform/523x/config.c
index 94e93943cbf8c71f4d5b63f563b944cbb294ee3b..b47a6886b8aec29dd6e73a17baaad7d190bc2f68 100644 (file)
--- a/arch/m68k/platform/523x/config.c
+++ b/arch/m68k/platform/523x/config.c
@@ -19,7 +19,6 @@
 #include <asm/machdep.h>
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
-#include <asm/mcfuart.h>
 
 /***************************************************************************/
 
@@ -67,18 +66,10 @@ void __init config_BSP(char *commandp, int size)
 {
        mach_reset = m523x_cpu_reset;
        mach_sched_init = hw_timer_init;
-}
-
-/***************************************************************************/
-
-static int __init init_BSP(void)
-{
+       m523x_fec_init();
 #ifdef CONFIG_SPI_COLDFIRE_QSPI
        m523x_qspi_init();
 #endif
-       return 0;
 }
 
-arch_initcall(init_BSP);
-
 /***************************************************************************/