Browse Source

m68knommu: clean up init code in ColdFire 532x startup

We can move all the init calls in the initcall code into the more general
arch setup code (which is config_BSP() here). That makes the 532x consistent
with other ColdFire CPUs setup code. It means we can get rid of the initcall
setup here all together. Also make sure we set the arch mach_reset function
pointer to get the local arch reset code called on reset.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Greg Ungerer 13 years ago
parent
commit
c05793c733
1 changed files with 6 additions and 14 deletions
  1. 6 14
      arch/m68k/platform/532x/config.c

+ 6 - 14
arch/m68k/platform/532x/config.c

@@ -83,6 +83,12 @@ void __init config_BSP(char *commandp, int size)
 #endif
 
 	mach_sched_init = hw_timer_init;
+	mach_reset = m532x_cpu_reset;
+	m532x_uarts_init();
+	m532x_fec_init();
+#ifdef CONFIG_SPI_COLDFIRE_QSPI
+	m532x_qspi_init();
+#endif
 
 #ifdef CONFIG_BDM_DISABLE
 	/*
@@ -94,20 +100,6 @@ void __init config_BSP(char *commandp, int size)
 #endif
 }
 
-/***************************************************************************/
-
-static int __init init_BSP(void)
-{
-	m532x_uarts_init();
-	m532x_fec_init();
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
-	m532x_qspi_init();
-#endif
-	return 0;
-}
-
-arch_initcall(init_BSP);
-
 /***************************************************************************/
 /* Board initialization */
 /***************************************************************************/