diff options
Diffstat (limited to 'arch/mips64')
| -rw-r--r-- | arch/mips64/arc/Makefile | 6 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-console.c | 17 |
2 files changed, 13 insertions, 10 deletions
diff --git a/arch/mips64/arc/Makefile b/arch/mips64/arc/Makefile index ca655299f..141093f78 100644 --- a/arch/mips64/arc/Makefile +++ b/arch/mips64/arc/Makefile @@ -3,9 +3,13 @@ # L_TARGET = arclib.a -L_OBJS = console.o init.o printf.o tree.o env.o cmdline.o misc.o time.o \ +L_OBJS = init.o printf.o tree.o env.o cmdline.o misc.o time.o \ file.o identify.o +ifndef CONFIG_SGI_IP27 +L_OBJS += console.o +endif + ifdef CONFIG_ARC_MEMORY L_OBJS += memory.o endif diff --git a/arch/mips64/sgi-ip27/ip27-console.c b/arch/mips64/sgi-ip27/ip27-console.c index a1bf912b9..3ba76f596 100644 --- a/arch/mips64/sgi-ip27/ip27-console.c +++ b/arch/mips64/sgi-ip27/ip27-console.c @@ -9,9 +9,10 @@ #include <asm/sn/sn0/hub.h> #include <asm/sn/klconfig.h> #include <asm/ioc3.h> +#include <asm/sgialib.h> #include <asm/sn/sn_private.h> -void ip27_putchar(char c) +void prom_putchar(char c) { struct ioc3 *ioc3; struct ioc3_uartregs *uart; @@ -23,17 +24,15 @@ void ip27_putchar(char c) uart->iu_thr = c; } +char __init prom_getchar(void) +{ + return(0); +} + static void ip27prom_console_write(struct console *con, const char *s, unsigned n) { - char c; - - while (n--) { - c = *(s++); - if (c == '\n') - ip27_putchar('\r'); - ip27_putchar(c); - } + prom_printf("%s", s); } static struct console ip27_prom_console = { |