summaryrefslogtreecommitdiffstats
path: root/target/linux/ifxmips/files/arch
diff options
context:
space:
mode:
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-12-26 22:47:45 +0000
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-12-26 22:47:45 +0000
commit632d9c15dd8378b7661fbb957d9938d4b75043e3 (patch)
tree520e80915ddf2802169281359a6c520ba9411ad3 /target/linux/ifxmips/files/arch
parentadde95556fe2b695c5427808d4a2faf2b84fc945 (diff)
add selection of console driver for ifxmips
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9936 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ifxmips/files/arch')
-rw-r--r--target/linux/ifxmips/files/arch/mips/ifxmips/prom.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c b/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c
index 514c879df..a3b62f011 100644
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c
@@ -29,6 +29,13 @@
#include <asm/bootinfo.h>
#include <asm/ifxmips/ifxmips.h>
+#ifdef CONFIG_IFXMIPS_USE_CONSOLE0
+#define ASC_OFFSET 0
+#elif CONFIG_IFXMIPS_USE_CONSOLE1
+#define ASC_OFFSET IFXMIPS_ASC1_BASE_OFFSET
+#else
+#error a tty for the console must be selected
+#endif
static char buf[1024];
void
@@ -39,11 +46,11 @@ prom_free_prom_memory (void)
void
prom_putchar (char c)
{
- while ((readl(IFXMIPS_ASC1_FSTAT) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF);
+ while ((readl(IFXMIPS_ASC0_FSTAT + ASC_OFFSET) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF);
if (c == '\n')
- writel('\r', IFXMIPS_ASC1_TBUF);
- writel(c, IFXMIPS_ASC1_TBUF);
+ writel('\r', IFXMIPS_ASC0_TBUF + ASC_OFFSET);
+ writel(c, IFXMIPS_ASC0_TBUF + ASC_OFFSET);
}
void