diff options
Diffstat (limited to 'arch/mips/philips')
-rw-r--r-- | arch/mips/philips/pnx8550/common/prom.c | 2 | ||||
-rw-r--r-- | arch/mips/philips/pnx8550/common/setup.c | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/arch/mips/philips/pnx8550/common/prom.c b/arch/mips/philips/pnx8550/common/prom.c index 8aeed6c2b8c3..2f567452e7ac 100644 --- a/arch/mips/philips/pnx8550/common/prom.c +++ b/arch/mips/philips/pnx8550/common/prom.c | |||
@@ -112,7 +112,7 @@ void __init prom_free_prom_memory(void) | |||
112 | 112 | ||
113 | extern int pnx8550_console_port; | 113 | extern int pnx8550_console_port; |
114 | 114 | ||
115 | /* used by prom_printf */ | 115 | /* used by early printk */ |
116 | void prom_putchar(char c) | 116 | void prom_putchar(char c) |
117 | { | 117 | { |
118 | if (pnx8550_console_port != -1) { | 118 | if (pnx8550_console_port != -1) { |
diff --git a/arch/mips/philips/pnx8550/common/setup.c b/arch/mips/philips/pnx8550/common/setup.c index e62123ca9b64..5bd737477685 100644 --- a/arch/mips/philips/pnx8550/common/setup.c +++ b/arch/mips/philips/pnx8550/common/setup.c | |||
@@ -41,8 +41,6 @@ | |||
41 | #include <uart.h> | 41 | #include <uart.h> |
42 | #include <nand.h> | 42 | #include <nand.h> |
43 | 43 | ||
44 | extern void prom_printf(char *fmt, ...); | ||
45 | |||
46 | extern void __init board_setup(void); | 44 | extern void __init board_setup(void); |
47 | extern void pnx8550_machine_restart(char *); | 45 | extern void pnx8550_machine_restart(char *); |
48 | extern void pnx8550_machine_halt(void); | 46 | extern void pnx8550_machine_halt(void); |
@@ -51,7 +49,6 @@ extern struct resource ioport_resource; | |||
51 | extern struct resource iomem_resource; | 49 | extern struct resource iomem_resource; |
52 | extern void pnx8550_time_init(void); | 50 | extern void pnx8550_time_init(void); |
53 | extern void rs_kgdb_hook(int tty_no); | 51 | extern void rs_kgdb_hook(int tty_no); |
54 | extern void prom_printf(char *fmt, ...); | ||
55 | extern char *prom_getcmdline(void); | 52 | extern char *prom_getcmdline(void); |
56 | 53 | ||
57 | struct resource standard_io_resources[] = { | 54 | struct resource standard_io_resources[] = { |
@@ -141,7 +138,7 @@ void __init plat_mem_setup(void) | |||
141 | argptr += strlen("console=ttyS"); | 138 | argptr += strlen("console=ttyS"); |
142 | pnx8550_console_port = *argptr == '0' ? 0 : 1; | 139 | pnx8550_console_port = *argptr == '0' ? 0 : 1; |
143 | 140 | ||
144 | /* We must initialize the UART (console) before prom_printf */ | 141 | /* We must initialize the UART (console) before early printk */ |
145 | /* Set LCR to 8-bit and BAUD to 38400 (no 5) */ | 142 | /* Set LCR to 8-bit and BAUD to 38400 (no 5) */ |
146 | ip3106_lcr(UART_BASE, pnx8550_console_port) = | 143 | ip3106_lcr(UART_BASE, pnx8550_console_port) = |
147 | PNX8XXX_UART_LCR_8BIT; | 144 | PNX8XXX_UART_LCR_8BIT; |
@@ -155,8 +152,8 @@ void __init plat_mem_setup(void) | |||
155 | argptr += strlen("kgdb=ttyS"); | 152 | argptr += strlen("kgdb=ttyS"); |
156 | line = *argptr == '0' ? 0 : 1; | 153 | line = *argptr == '0' ? 0 : 1; |
157 | rs_kgdb_hook(line); | 154 | rs_kgdb_hook(line); |
158 | prom_printf("KGDB: Using ttyS%i for session, " | 155 | pr_info("KGDB: Using ttyS%i for session, " |
159 | "please connect your debugger\n", line ? 1 : 0); | 156 | "please connect your debugger\n", line ? 1 : 0); |
160 | } | 157 | } |
161 | #endif | 158 | #endif |
162 | return; | 159 | return; |