diff options
author | Greg Ungerer <gerg@snapgear.com> | 2005-09-01 20:42:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 03:57:29 -0400 |
commit | e6070a1712e69779f322239056fb5f1e1db802ce (patch) | |
tree | a223bb24216ee3f81e99feb2dbca5d9c2d9697dd /arch | |
parent | b5aaf3f71cf5a6115cf76671b011de0209223fc2 (diff) |
[PATCH] m68knommu: new family (523x) and board setup
. setup for the new 523x ColdFire family
. break up of 527x to be 5271 and 5275
. some white space cleanup
Signed-off-by: Greg Ungerer <gerg@uclinux.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/m68knommu/kernel/setup.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c index 557238596dcb..a220345e9746 100644 --- a/arch/m68knommu/kernel/setup.c +++ b/arch/m68knommu/kernel/setup.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * Copyleft ()) 2000 James D. Schettine {james@telos-systems.com} | 6 | * Copyleft ()) 2000 James D. Schettine {james@telos-systems.com} |
7 | * Copyright (C) 1998 Kenneth Albanowski <kjahds@kjahds.com> | 7 | * Copyright (C) 1998 Kenneth Albanowski <kjahds@kjahds.com> |
8 | * Copyright (C) 1995 Hamish Macdonald | 8 | * Copyright (C) 1995 Hamish Macdonald |
9 | * Copyright (C) 2000 Lineo Inc. (www.lineo.com) | 9 | * Copyright (C) 2000 Lineo Inc. (www.lineo.com) |
10 | * Copyright (C) 2001 Lineo, Inc. <www.lineo.com> | 10 | * Copyright (C) 2001 Lineo, Inc. <www.lineo.com> |
11 | * | 11 | * |
12 | * 68VZ328 Fixes/support Evan Stawnyczy <e@lineo.ca> | 12 | * 68VZ328 Fixes/support Evan Stawnyczy <e@lineo.ca> |
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
24 | #include <linux/fs.h> | 24 | #include <linux/fs.h> |
25 | #include <linux/fb.h> | 25 | #include <linux/fb.h> |
26 | #include <linux/module.h> | ||
26 | #include <linux/console.h> | 27 | #include <linux/console.h> |
27 | #include <linux/genhd.h> | 28 | #include <linux/genhd.h> |
28 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
@@ -45,6 +46,9 @@ unsigned long rom_length; | |||
45 | unsigned long memory_start; | 46 | unsigned long memory_start; |
46 | unsigned long memory_end; | 47 | unsigned long memory_end; |
47 | 48 | ||
49 | EXPORT_SYMBOL(memory_start); | ||
50 | EXPORT_SYMBOL(memory_end); | ||
51 | |||
48 | char command_line[COMMAND_LINE_SIZE]; | 52 | char command_line[COMMAND_LINE_SIZE]; |
49 | 53 | ||
50 | /* setup some dummy routines */ | 54 | /* setup some dummy routines */ |
@@ -103,15 +107,21 @@ void (*mach_power_off)( void ) = NULL; | |||
103 | #if defined(CONFIG_M5206e) | 107 | #if defined(CONFIG_M5206e) |
104 | #define CPU "COLDFIRE(m5206e)" | 108 | #define CPU "COLDFIRE(m5206e)" |
105 | #endif | 109 | #endif |
110 | #if defined(CONFIG_M523x) | ||
111 | #define CPU "COLDFIRE(m523x)" | ||
112 | #endif | ||
106 | #if defined(CONFIG_M5249) | 113 | #if defined(CONFIG_M5249) |
107 | #define CPU "COLDFIRE(m5249)" | 114 | #define CPU "COLDFIRE(m5249)" |
108 | #endif | 115 | #endif |
109 | #if defined(CONFIG_M527x) | 116 | #if defined(CONFIG_M5271) |
110 | #define CPU "COLDFIRE(m5270/5271/5274/5275)" | 117 | #define CPU "COLDFIRE(m5270/5271)" |
111 | #endif | 118 | #endif |
112 | #if defined(CONFIG_M5272) | 119 | #if defined(CONFIG_M5272) |
113 | #define CPU "COLDFIRE(m5272)" | 120 | #define CPU "COLDFIRE(m5272)" |
114 | #endif | 121 | #endif |
122 | #if defined(CONFIG_M5275) | ||
123 | #define CPU "COLDFIRE(m5274/5275)" | ||
124 | #endif | ||
115 | #if defined(CONFIG_M528x) | 125 | #if defined(CONFIG_M528x) |
116 | #define CPU "COLDFIRE(m5280/5282)" | 126 | #define CPU "COLDFIRE(m5280/5282)" |
117 | #endif | 127 | #endif |
@@ -152,7 +162,7 @@ void setup_arch(char **cmdline_p) | |||
152 | init_mm.start_code = (unsigned long) &_stext; | 162 | init_mm.start_code = (unsigned long) &_stext; |
153 | init_mm.end_code = (unsigned long) &_etext; | 163 | init_mm.end_code = (unsigned long) &_etext; |
154 | init_mm.end_data = (unsigned long) &_edata; | 164 | init_mm.end_data = (unsigned long) &_edata; |
155 | init_mm.brk = (unsigned long) 0; | 165 | init_mm.brk = (unsigned long) 0; |
156 | 166 | ||
157 | config_BSP(&command_line[0], sizeof(command_line)); | 167 | config_BSP(&command_line[0], sizeof(command_line)); |
158 | 168 | ||
@@ -171,7 +181,7 @@ void setup_arch(char **cmdline_p) | |||
171 | #endif | 181 | #endif |
172 | #ifdef CONFIG_ELITE | 182 | #ifdef CONFIG_ELITE |
173 | printk(KERN_INFO "Modified for M5206eLITE by Rob Scott, rscott@mtrob.fdns.net\n"); | 183 | printk(KERN_INFO "Modified for M5206eLITE by Rob Scott, rscott@mtrob.fdns.net\n"); |
174 | #endif | 184 | #endif |
175 | #ifdef CONFIG_TELOS | 185 | #ifdef CONFIG_TELOS |
176 | printk(KERN_INFO "Modified for Omnia ToolVox by James D. Schettine, james@telos-systems.com\n"); | 186 | printk(KERN_INFO "Modified for Omnia ToolVox by James D. Schettine, james@telos-systems.com\n"); |
177 | #endif | 187 | #endif |
@@ -200,6 +210,9 @@ void setup_arch(char **cmdline_p) | |||
200 | #ifdef CONFIG_DRAGEN2 | 210 | #ifdef CONFIG_DRAGEN2 |
201 | printk(KERN_INFO "DragonEngine II board support by Georges Menie\n"); | 211 | printk(KERN_INFO "DragonEngine II board support by Georges Menie\n"); |
202 | #endif | 212 | #endif |
213 | #ifdef CONFIG_M5235EVB | ||
214 | printk(KERN_INFO "Motorola M5235EVB support (C)2005 Syn-tech Systems, Inc. (Jate Sujjavanich)"); | ||
215 | #endif | ||
203 | 216 | ||
204 | #ifdef DEBUG | 217 | #ifdef DEBUG |
205 | printk(KERN_DEBUG "KERNEL -> TEXT=0x%06x-0x%06x DATA=0x%06x-0x%06x " | 218 | printk(KERN_DEBUG "KERNEL -> TEXT=0x%06x-0x%06x DATA=0x%06x-0x%06x " |
@@ -223,7 +236,7 @@ void setup_arch(char **cmdline_p) | |||
223 | saved_command_line[COMMAND_LINE_SIZE-1] = 0; | 236 | saved_command_line[COMMAND_LINE_SIZE-1] = 0; |
224 | 237 | ||
225 | #ifdef DEBUG | 238 | #ifdef DEBUG |
226 | if (strlen(*cmdline_p)) | 239 | if (strlen(*cmdline_p)) |
227 | printk(KERN_DEBUG "Command line: '%s'\n", *cmdline_p); | 240 | printk(KERN_DEBUG "Command line: '%s'\n", *cmdline_p); |
228 | #endif | 241 | #endif |
229 | 242 | ||