diff options
| author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-01-12 12:07:33 +0000 |
|---|---|---|
| committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-01-12 12:07:33 +0000 |
| commit | 62da27b5f7c75fd82074bbf824c3b7bc2efe51b8 (patch) | |
| tree | 161ea53ccfd4dbc1416225b411fcf06fcb5c2a58 /target/linux/ifxmips/files/arch | |
| parent | 224733bba3c36cdca148298606fe42c4d5791704 (diff) | |
revert some breakage
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10176 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ifxmips/files/arch')
| -rw-r--r-- | target/linux/ifxmips/files/arch/mips/ifxmips/prom.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c b/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c index a3b62f0114..514c879df3 100644 --- a/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c +++ b/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c @@ -29,13 +29,6 @@ #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 @@ -46,11 +39,11 @@ prom_free_prom_memory (void) void prom_putchar (char c) { - while ((readl(IFXMIPS_ASC0_FSTAT + ASC_OFFSET) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF); + while ((readl(IFXMIPS_ASC1_FSTAT) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF); if (c == '\n') - writel('\r', IFXMIPS_ASC0_TBUF + ASC_OFFSET); - writel(c, IFXMIPS_ASC0_TBUF + ASC_OFFSET); + writel('\r', IFXMIPS_ASC1_TBUF); + writel(c, IFXMIPS_ASC1_TBUF); } void |