diff options
| author | John Crispin <john@openwrt.org> | 2008-01-12 12:07:33 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2008-01-12 12:07:33 +0000 |
| commit | eb77b3708446c135471914d1fde7f073434e89da (patch) | |
| tree | 57f19658f6766e24b4614db2fe652f83286e7931 /target/linux/ifxmips/files/arch/mips | |
| parent | 31c7a323e6215e9a4b2ae1f6ea4f009586bb04ea (diff) | |
| download | master-31e0f0ae-eb77b3708446c135471914d1fde7f073434e89da.tar.gz master-31e0f0ae-eb77b3708446c135471914d1fde7f073434e89da.tar.bz2 master-31e0f0ae-eb77b3708446c135471914d1fde7f073434e89da.zip | |
revert some breakage
SVN-Revision: 10176
Diffstat (limited to 'target/linux/ifxmips/files/arch/mips')
| -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 |