diff options
author | Greg Ungerer <gerg@snapgear.com> | 2007-07-25 08:07:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-25 14:05:01 -0400 |
commit | bc72450aebe73587f80bbae8fc0b62c3d81b85fe (patch) | |
tree | 90bd852d171be66736a9ae9e2acca07586ec3d4d /arch/m68knommu/platform/5272 | |
parent | 020f9e16c306f929382ad81e5a0ecf4f41887616 (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/5272')
-rw-r--r-- | arch/m68knommu/platform/5272/config.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/m68knommu/platform/5272/config.c b/arch/m68knommu/platform/5272/config.c index 6b437cc9777..609b10e4b9b 100644 --- a/arch/m68knommu/platform/5272/config.c +++ b/arch/m68knommu/platform/5272/config.c | |||
@@ -113,10 +113,7 @@ void config_BSP(char *commandp, int size) | |||
113 | 113 | ||
114 | mcf_disableall(); | 114 | mcf_disableall(); |
115 | 115 | ||
116 | #if defined(CONFIG_BOOTPARAM) | 116 | #if defined(CONFIG_NETtel) || defined(CONFIG_SCALES) |
117 | strncpy(commandp, CONFIG_BOOTPARAM_STRING, size); | ||
118 | commandp[size-1] = 0; | ||
119 | #elif defined(CONFIG_NETtel) || defined(CONFIG_SCALES) | ||
120 | /* Copy command line from FLASH to local buffer... */ | 117 | /* Copy command line from FLASH to local buffer... */ |
121 | memcpy(commandp, (char *) 0xf0004000, size); | 118 | memcpy(commandp, (char *) 0xf0004000, size); |
122 | commandp[size-1] = 0; | 119 | commandp[size-1] = 0; |
@@ -128,8 +125,6 @@ void config_BSP(char *commandp, int size) | |||
128 | /* Copy command line from FLASH to local buffer... */ | 125 | /* Copy command line from FLASH to local buffer... */ |
129 | memcpy(commandp, (char *) 0xf0010000, size); | 126 | memcpy(commandp, (char *) 0xf0010000, size); |
130 | commandp[size-1] = 0; | 127 | commandp[size-1] = 0; |
131 | #else | ||
132 | memset(commandp, 0, size); | ||
133 | #endif | 128 | #endif |
134 | 129 | ||
135 | mcf_timervector = 69; | 130 | mcf_timervector = 69; |