diff options
author | Rafael Ignacio Zurita <rizurita@yahoo.com> | 2009-08-04 01:38:08 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-04 01:38:08 -0400 |
commit | 05aa7882757f68af799140142ec44f83b2df4298 (patch) | |
tree | 5670fffc8064428ff2b021463f3a5a75c4c5e738 /arch/sh | |
parent | fdeb076f20df14b1c7f2817362172548d146b121 (diff) |
sh: Add early printk support for SH770x CPUs.
This adds early printk support for SH770x (tested on SH7709 based hp6xx).
Signed-off-by: Rafael Ignacio Zurita <rizurita@yahoo.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/Kconfig.debug | 1 | ||||
-rw-r--r-- | arch/sh/kernel/early_printk.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug index a6dce41296e7..763b792b1611 100644 --- a/arch/sh/Kconfig.debug +++ b/arch/sh/Kconfig.debug | |||
@@ -43,6 +43,7 @@ config EARLY_SCIF_CONSOLE_PORT | |||
43 | default "0xfffe8000" if CPU_SUBTYPE_SH7203 | 43 | default "0xfffe8000" if CPU_SUBTYPE_SH7203 |
44 | default "0xfffe9800" if CPU_SUBTYPE_SH7206 || CPU_SUBTYPE_SH7263 | 44 | default "0xfffe9800" if CPU_SUBTYPE_SH7206 || CPU_SUBTYPE_SH7263 |
45 | default "0xffe80000" if CPU_SH4 | 45 | default "0xffe80000" if CPU_SH4 |
46 | default "0xa4000150" if CPU_SH3 | ||
46 | default "0x00000000" | 47 | default "0x00000000" |
47 | 48 | ||
48 | config EARLY_PRINTK | 49 | config EARLY_PRINTK |
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c index a952dcf9999d..64f2746baf91 100644 --- a/arch/sh/kernel/early_printk.c +++ b/arch/sh/kernel/early_printk.c | |||
@@ -134,7 +134,7 @@ static void scif_sercon_init(char *s) | |||
134 | sci_out(&scif_port, SCFCR, 0x0030); /* TTRG=b'11 */ | 134 | sci_out(&scif_port, SCFCR, 0x0030); /* TTRG=b'11 */ |
135 | sci_out(&scif_port, SCSCR, 0x0030); /* TE, RE */ | 135 | sci_out(&scif_port, SCSCR, 0x0030); /* TE, RE */ |
136 | } | 136 | } |
137 | #elif defined(CONFIG_CPU_SH4) | 137 | #elif defined(CONFIG_CPU_SH4) || defined(CONFIG_CPU_SH3) |
138 | #define DEFAULT_BAUD 115200 | 138 | #define DEFAULT_BAUD 115200 |
139 | /* | 139 | /* |
140 | * Simple SCIF init, primarily aimed at SH7750 and other similar SH-4 | 140 | * Simple SCIF init, primarily aimed at SH7750 and other similar SH-4 |
@@ -220,11 +220,9 @@ static int __init setup_early_printk(char *buf) | |||
220 | early_console = &scif_console; | 220 | early_console = &scif_console; |
221 | 221 | ||
222 | #if !defined(CONFIG_SH_STANDARD_BIOS) | 222 | #if !defined(CONFIG_SH_STANDARD_BIOS) |
223 | #if defined(CONFIG_CPU_SH4) || defined(CONFIG_CPU_SUBTYPE_SH7720) || \ | 223 | #if defined(CONFIG_CPU_SH4) || defined(CONFIG_CPU_SH3) |
224 | defined(CONFIG_CPU_SUBTYPE_SH7721) | ||
225 | scif_sercon_init(buf + 6); | 224 | scif_sercon_init(buf + 6); |
226 | #endif | 225 | #endif |
227 | #endif | ||
228 | } | 226 | } |
229 | #endif | 227 | #endif |
230 | 228 | ||