aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68knommu/platform/5307
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@snapgear.com>2007-07-25 08:07:20 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-25 14:05:01 -0400
commitbc72450aebe73587f80bbae8fc0b62c3d81b85fe (patch)
tree90bd852d171be66736a9ae9e2acca07586ec3d4d /arch/m68knommu/platform/5307
parent020f9e16c306f929382ad81e5a0ecf4f41887616 (diff)
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: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68knommu/platform/5307')
-rw-r--r--arch/m68knommu/platform/5307/config.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/m68knommu/platform/5307/config.c b/arch/m68knommu/platform/5307/config.c
index e04b84deb57d..1f10e941b87c 100644
--- a/arch/m68knommu/platform/5307/config.c
+++ b/arch/m68knommu/platform/5307/config.c
@@ -111,10 +111,7 @@ void config_BSP(char *commandp, int size)
111{ 111{
112 mcf_setimr(MCFSIM_IMR_MASKALL); 112 mcf_setimr(MCFSIM_IMR_MASKALL);
113 113
114#if defined(CONFIG_BOOTPARAM) 114#if defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \
115 strncpy(commandp, CONFIG_BOOTPARAM_STRING, size);
116 commandp[size-1] = 0;
117#elif defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \
118 defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3) || \ 115 defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3) || \
119 defined(CONFIG_CLEOPATRA) 116 defined(CONFIG_CLEOPATRA)
120 /* Copy command line from FLASH to local buffer... */ 117 /* Copy command line from FLASH to local buffer... */
@@ -124,8 +121,6 @@ void config_BSP(char *commandp, int size)
124 mcf_timervector = 30; 121 mcf_timervector = 30;
125 mcf_profilevector = 31; 122 mcf_profilevector = 31;
126 mcf_timerlevel = 6; 123 mcf_timerlevel = 6;
127#else
128 memset(commandp, 0, size);
129#endif 124#endif
130 125
131 mach_sched_init = coldfire_timer_init; 126 mach_sched_init = coldfire_timer_init;