Skip to content

Commit

Permalink
m68knommu: clean up init code in ColdFire 532x startup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Ungerer committed Mar 4, 2012
1 parent 9773be5 commit c05793c
Showing 1 changed file with 6 additions and 14 deletions.
20 changes: 6 additions & 14 deletions arch/m68k/platform/532x/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
/*
Expand All @@ -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 */
/***************************************************************************/
Expand Down

0 comments on commit c05793c

Please sign in to comment.