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

Commit bc72450a authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds
Browse files

m68knommu: make BOOTPARAM setup common 



Currently most of the m68knommu cpu/board setup files are handling
the setup of fixed boot parameters (via CONFIG_BOOTPARAM) themselves.
Move all this into the common setup code.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 020f9e16

arch/m68knommu/kernel/setup.c

+5 −0
Original line number Diff line number Diff line
@@ -132,6 +132,11 @@ void setup_arch(char **cmdline_p) 


	config_BSP(&command_line[0], sizeof(command_line));



#if defined(CONFIG_BOOTPARAM)

	strncpy(&command_line[0], CONFIG_BOOTPARAM_STRING, sizeof(command_line));

	command_line[sizeof(command_line) - 1] = 0;

#endif



	printk(KERN_INFO "\x0F\r\n\nuClinux/" CPU "\n");



#ifdef CONFIG_UCDIMM

arch/m68knommu/platform/5206/config.c

+0 −8
Original line number Diff line number Diff line
@@ -98,14 +98,6 @@ int mcf_timerirqpending(int timer) 
void config_BSP(char *commandp, int size)

{

	mcf_setimr(MCFSIM_IMR_MASKALL);



#if defined(CONFIG_BOOTPARAM)

	strncpy(commandp, CONFIG_BOOTPARAM_STRING, size);

	commandp[size-1] = 0;

#else

	memset(commandp, 0, size);

#endif



	mach_sched_init = coldfire_timer_init;

	mach_tick = coldfire_tick;

	mach_gettimeoffset = coldfire_timer_offset;

arch/m68knommu/platform/5206e/config.c

+1 −6
Original line number Diff line number Diff line
@@ -98,15 +98,10 @@ void config_BSP(char *commandp, int size) 
{

	mcf_setimr(MCFSIM_IMR_MASKALL);



#if defined(CONFIG_BOOTPARAM)

	strncpy(commandp, CONFIG_BOOTPARAM_STRING, size);

	commandp[size-1] = 0;

#elif defined(CONFIG_NETtel)

#if defined(CONFIG_NETtel)

	/* Copy command line from FLASH to local buffer... */

	memcpy(commandp, (char *) 0xf0004000, size);

	commandp[size-1] = 0;

#else

	memset(commandp, 0, size);

#endif /* CONFIG_NETtel */



	mach_sched_init = coldfire_timer_init;

arch/m68knommu/platform/520x/config.c

+0 −7
Original line number Diff line number Diff line
@@ -48,13 +48,6 @@ void mcf_autovector(unsigned int vec) 


void config_BSP(char *commandp, int size)

{

#ifdef CONFIG_BOOTPARAM

    strncpy(commandp, CONFIG_BOOTPARAM_STRING, size);

    commandp[size-1] = 0;

#else

    memset(commandp, 0, size);

#endif



    mach_sched_init = coldfire_pit_init;

    mach_tick = coldfire_pit_tick;

    mach_gettimeoffset = coldfire_pit_offset;

arch/m68knommu/platform/523x/config.c

+0 −8
Original line number Diff line number Diff line
@@ -63,14 +63,6 @@ void mcf_autovector(unsigned int vec) 
void config_BSP(char *commandp, int size)

{

	mcf_disableall();



#ifdef CONFIG_BOOTPARAM

	strncpy(commandp, CONFIG_BOOTPARAM_STRING, size);

	commandp[size-1] = 0;

#else

	memset(commandp, 0, size);

#endif



	mach_sched_init = coldfire_pit_init;

	mach_tick = coldfire_pit_tick;

	mach_gettimeoffset = coldfire_pit_offset;