Skip to content

Commit

Permalink
m68knommu: make BOOTPARAM setup common
Browse files Browse the repository at this point in the history 
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: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Greg Ungerer authored and Linus Torvalds committed Jul 25, 2007
1 parent 020f9e1 commit bc72450
Show file tree
Hide file tree
Showing 13 changed files with 9 additions and 83 deletions.
5 changes: 5 additions & 0 deletions arch/m68knommu/kernel/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions arch/m68knommu/platform/5206/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 1 addition & 6 deletions arch/m68knommu/platform/5206e/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions arch/m68knommu/platform/520x/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 0 additions & 8 deletions arch/m68knommu/platform/523x/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 0 additions & 8 deletions arch/m68knommu/platform/5249/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,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;
Expand Down
7 changes: 1 addition & 6 deletions arch/m68knommu/platform/5272/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,7 @@ void config_BSP(char *commandp, int size)

mcf_disableall();

#if defined(CONFIG_BOOTPARAM)
strncpy(commandp, CONFIG_BOOTPARAM_STRING, size);
commandp[size-1] = 0;
#elif defined(CONFIG_NETtel) || defined(CONFIG_SCALES)
#if defined(CONFIG_NETtel) || defined(CONFIG_SCALES)
/* Copy command line from FLASH to local buffer... */
memcpy(commandp, (char *) 0xf0004000, size);
commandp[size-1] = 0;
Expand All @@ -128,8 +125,6 @@ void config_BSP(char *commandp, int size)
/* Copy command line from FLASH to local buffer... */
memcpy(commandp, (char *) 0xf0010000, size);
commandp[size-1] = 0;
#else
memset(commandp, 0, size);
#endif

mcf_timervector = 69;
Expand Down
8 changes: 0 additions & 8 deletions arch/m68knommu/platform/527x/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 0 additions & 8 deletions arch/m68knommu/platform/528x/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 1 addition & 6 deletions arch/m68knommu/platform/5307/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,7 @@ 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) || defined(CONFIG_eLIA) || \
#if defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \
defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3) || \
defined(CONFIG_CLEOPATRA)
/* Copy command line from FLASH to local buffer... */
Expand All @@ -124,8 +121,6 @@ void config_BSP(char *commandp, int size)
mcf_timervector = 30;
mcf_profilevector = 31;
mcf_timerlevel = 6;
#else
memset(commandp, 0, size);
#endif

mach_sched_init = coldfire_timer_init;
Expand Down
5 changes: 1 addition & 4 deletions arch/m68knommu/platform/532x/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,7 @@ 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
#if !defined(CONFIG_BOOTPARAM)
/* Copy command line from FLASH to local buffer... */
memcpy(commandp, (char *) 0x4000, 4);
if(strncmp(commandp, "kcl ", 4) == 0){
Expand Down
7 changes: 0 additions & 7 deletions arch/m68knommu/platform/5407/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,6 @@ 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

#if defined(CONFIG_CLEOPATRA)
/* Different timer setup - to prevent device clash */
mcf_timervector = 30;
Expand Down
7 changes: 0 additions & 7 deletions arch/m68knommu/platform/68VZ328/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,6 @@ void config_BSP(char *command, int size)
{
printk(KERN_INFO "68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n");

#if defined(CONFIG_BOOTPARAM)
strncpy(command, CONFIG_BOOTPARAM_STRING, size);
command[size-1] = 0;
#else
memset(command, 0, size);
#endif

init_hardware(command, size);

mach_sched_init = (void *) m68328_timer_init;
Expand Down

0 comments on commit bc72450

Please sign in to comment.