diff options
Diffstat (limited to 'arch/m68knommu/platform/5272/config.c')
-rw-r--r-- | arch/m68knommu/platform/5272/config.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/m68knommu/platform/5272/config.c b/arch/m68knommu/platform/5272/config.c index 6b437cc97776..1365a8300d5d 100644 --- a/arch/m68knommu/platform/5272/config.c +++ b/arch/m68knommu/platform/5272/config.c | |||
@@ -28,7 +28,6 @@ | |||
28 | void coldfire_tick(void); | 28 | void coldfire_tick(void); |
29 | void coldfire_timer_init(irq_handler_t handler); | 29 | void coldfire_timer_init(irq_handler_t handler); |
30 | unsigned long coldfire_timer_offset(void); | 30 | unsigned long coldfire_timer_offset(void); |
31 | void coldfire_trap_init(void); | ||
32 | void coldfire_reset(void); | 31 | void coldfire_reset(void); |
33 | 32 | ||
34 | extern unsigned int mcf_timervector; | 33 | extern unsigned int mcf_timervector; |
@@ -113,10 +112,7 @@ void config_BSP(char *commandp, int size) | |||
113 | 112 | ||
114 | mcf_disableall(); | 113 | mcf_disableall(); |
115 | 114 | ||
116 | #if defined(CONFIG_BOOTPARAM) | 115 | #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... */ | 116 | /* Copy command line from FLASH to local buffer... */ |
121 | memcpy(commandp, (char *) 0xf0004000, size); | 117 | memcpy(commandp, (char *) 0xf0004000, size); |
122 | commandp[size-1] = 0; | 118 | commandp[size-1] = 0; |
@@ -128,8 +124,6 @@ void config_BSP(char *commandp, int size) | |||
128 | /* Copy command line from FLASH to local buffer... */ | 124 | /* Copy command line from FLASH to local buffer... */ |
129 | memcpy(commandp, (char *) 0xf0010000, size); | 125 | memcpy(commandp, (char *) 0xf0010000, size); |
130 | commandp[size-1] = 0; | 126 | commandp[size-1] = 0; |
131 | #else | ||
132 | memset(commandp, 0, size); | ||
133 | #endif | 127 | #endif |
134 | 128 | ||
135 | mcf_timervector = 69; | 129 | mcf_timervector = 69; |
@@ -137,7 +131,6 @@ void config_BSP(char *commandp, int size) | |||
137 | mach_sched_init = coldfire_timer_init; | 131 | mach_sched_init = coldfire_timer_init; |
138 | mach_tick = coldfire_tick; | 132 | mach_tick = coldfire_tick; |
139 | mach_gettimeoffset = coldfire_timer_offset; | 133 | mach_gettimeoffset = coldfire_timer_offset; |
140 | mach_trap_init = coldfire_trap_init; | ||
141 | mach_reset = coldfire_reset; | 134 | mach_reset = coldfire_reset; |
142 | } | 135 | } |
143 | 136 | ||