Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d894b89b authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68knommu: factor some common ColdFire cpu reset code 



A number of the early ColdFire cores use the same code to reset the CPU.
Currently that is duplicated in each of the sub-arch files. Pull out this
common code and use a single copy of it for all CPU types that use it.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 440f6ffc

arch/m68k/platform/5206/config.c

+0 −12
Original line number Diff line number Diff line
@@ -19,17 +19,6 @@ 


/***************************************************************************/



void m5206_cpu_reset(void)

{

	local_irq_disable();

	/* Set watchdog to soft reset, and enabled */

	__raw_writeb(0xc0, MCF_MBAR + MCFSIM_SYPCR);

	for (;;)

		/* wait for watchdog to timeout */;

}



/***************************************************************************/



void __init config_BSP(char *commandp, int size)

{

#if defined(CONFIG_NETtel)
@@ -38,7 +27,6 @@ void __init config_BSP(char *commandp, int size) 
	commandp[size-1] = 0;

#endif /* CONFIG_NETtel */



	mach_reset = m5206_cpu_reset;

	mach_sched_init = hw_timer_init;



	/* Only support the external interrupts on their primary level */

arch/m68k/platform/5249/config.c

+1 −12
Original line number Diff line number Diff line
@@ -83,21 +83,10 @@ static void __init m5249_smc91x_init(void) 


/***************************************************************************/



void m5249_cpu_reset(void)

{

	local_irq_disable();

	/* Set watchdog to soft reset, and enabled */

	__raw_writeb(0xc0, MCF_MBAR + MCFSIM_SYPCR);

	for (;;)

		/* wait for watchdog to timeout */;

}



/***************************************************************************/



void __init config_BSP(char *commandp, int size)

{

	mach_reset = m5249_cpu_reset;

	mach_sched_init = hw_timer_init;



#ifdef CONFIG_M5249C3

	m5249_smc91x_init();

#endif

arch/m68k/platform/5307/config.c

+0 −12
Original line number Diff line number Diff line
@@ -28,17 +28,6 @@ unsigned char ledbank = 0xff; 


/***************************************************************************/



void m5307_cpu_reset(void)

{

	local_irq_disable();

	/* Set watchdog to soft reset, and enabled */

	__raw_writeb(0xc0, MCF_MBAR + MCFSIM_SYPCR);

	for (;;)

		/* wait for watchdog to timeout */;

}



/***************************************************************************/



void __init config_BSP(char *commandp, int size)

{

#if defined(CONFIG_NETtel) || \
@@ -48,7 +37,6 @@ void __init config_BSP(char *commandp, int size) 
	commandp[size-1] = 0;

#endif



	mach_reset = m5307_cpu_reset;

	mach_sched_init = hw_timer_init;



	/* Only support the external interrupts on their primary level */

arch/m68k/platform/5407/config.c

+0 −12
Original line number Diff line number Diff line
@@ -19,20 +19,8 @@ 


/***************************************************************************/



void m5407_cpu_reset(void)

{

	local_irq_disable();

	/* set watchdog to soft reset, and enabled */

	__raw_writeb(0xc0, MCF_MBAR + MCFSIM_SYPCR);

	for (;;)

		/* wait for watchdog to timeout */;

}



/***************************************************************************/



void __init config_BSP(char *commandp, int size)

{

	mach_reset = m5407_cpu_reset;

	mach_sched_init = hw_timer_init;



	/* Only support the external interrupts on their primary level */

arch/m68k/platform/coldfire/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -15,17 +15,17 @@ 
asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1



obj-$(CONFIG_COLDFIRE)	+= cache.o clk.o device.o dma.o entry.o vectors.o

obj-$(CONFIG_M5206)	+= timers.o intc.o

obj-$(CONFIG_M5206e)	+= timers.o intc.o

obj-$(CONFIG_M5206)	+= timers.o intc.o reset.o

obj-$(CONFIG_M5206e)	+= timers.o intc.o reset.o

obj-$(CONFIG_M520x)	+= pit.o intc-simr.o

obj-$(CONFIG_M523x)	+= pit.o dma_timer.o intc-2.o

obj-$(CONFIG_M5249)	+= timers.o intc.o

obj-$(CONFIG_M5249)	+= timers.o intc.o reset.o

obj-$(CONFIG_M527x)	+= pit.o intc-2.o

obj-$(CONFIG_M5272)	+= timers.o

obj-$(CONFIG_M528x)	+= pit.o intc-2.o

obj-$(CONFIG_M5307)	+= timers.o intc.o

obj-$(CONFIG_M5307)	+= timers.o intc.o reset.o

obj-$(CONFIG_M532x)	+= timers.o intc-simr.o

obj-$(CONFIG_M5407)	+= timers.o intc.o

obj-$(CONFIG_M5407)	+= timers.o intc.o reset.o

obj-$(CONFIG_M54xx)	+= sltimers.o intc-2.o



obj-y			+= pinmux.o gpio.o