diff options
| author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-03 15:15:52 +0000 |
|---|---|---|
| committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-03 15:15:52 +0000 |
| commit | dfffaea839fd631ec0b3d4f58540316a04c4f2ad (patch) | |
| tree | b174b3a3d03c0c2b4a9b9c980efe38089069a2d4 /target/linux/lantiq/patches-3.0/0001-MIPS-lantiq-fix-early-printk.patch | |
| parent | de6080b7c2e5f3d2a9ed9677e3df0667bfc31842 (diff) | |
lantiq: bump to 3.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28721 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.0/0001-MIPS-lantiq-fix-early-printk.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.0/0001-MIPS-lantiq-fix-early-printk.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/target/linux/lantiq/patches-3.0/0001-MIPS-lantiq-fix-early-printk.patch b/target/linux/lantiq/patches-3.0/0001-MIPS-lantiq-fix-early-printk.patch deleted file mode 100644 index 2671360f93..0000000000 --- a/target/linux/lantiq/patches-3.0/0001-MIPS-lantiq-fix-early-printk.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 91f8d0c8fbb9ea70bf78a291e312157177be8ee3 Mon Sep 17 00:00:00 2001 -From: John Crispin <blogic@openwrt.org> -Date: Sat, 20 Aug 2011 18:55:13 +0200 -Subject: [PATCH 01/24] MIPS: lantiq: fix early printk - -The code was using a 32bit write operation in the early_printk code. This -resulted in 3 zero bytes also being written to the serial port. Change the -memory access to 8bit. - -Signed-off-by: Thomas Langer <thomas.langer@lantiq.com> -Signed-off-by: John Crispin <blogic@openwrt.org> -Cc: linux-mips@linux-mips.org ---- - .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 4 ++++ - arch/mips/lantiq/early_printk.c | 14 ++++++++------ - 2 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h -index 8a3c6be..e6d1ca0 100644 ---- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h -+++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h -@@ -34,6 +34,10 @@ - #define LTQ_ASC1_BASE_ADDR 0x1E100C00 - #define LTQ_ASC_SIZE 0x400 - -+/* during early_printk no ioremap is possible -+ lets use KSEG1 instead */ -+#define LTQ_EARLY_ASC KSEG1ADDR(LTQ_ASC1_BASE_ADDR) -+ - /* RCU - reset control unit */ - #define LTQ_RCU_BASE_ADDR 0x1F203000 - #define LTQ_RCU_SIZE 0x1000 -diff --git a/arch/mips/lantiq/early_printk.c b/arch/mips/lantiq/early_printk.c -index 972e05f..5089075 100644 ---- a/arch/mips/lantiq/early_printk.c -+++ b/arch/mips/lantiq/early_printk.c -@@ -12,11 +12,13 @@ - #include <lantiq.h> - #include <lantiq_soc.h> - --/* no ioremap possible at this early stage, lets use KSEG1 instead */ --#define LTQ_ASC_BASE KSEG1ADDR(LTQ_ASC1_BASE_ADDR) - #define ASC_BUF 1024 --#define LTQ_ASC_FSTAT ((u32 *)(LTQ_ASC_BASE + 0x0048)) --#define LTQ_ASC_TBUF ((u32 *)(LTQ_ASC_BASE + 0x0020)) -+#define LTQ_ASC_FSTAT ((u32 *)(LTQ_EARLY_ASC + 0x0048)) -+#ifdef __BIG_ENDIAN -+#define LTQ_ASC_TBUF ((u32 *)(LTQ_EARLY_ASC + 0x0020 + 3)) -+#else -+#define LTQ_ASC_TBUF ((u32 *)(LTQ_EARLY_ASC + 0x0020)) -+#endif - #define TXMASK 0x3F00 - #define TXOFFSET 8 - -@@ -27,7 +29,7 @@ void prom_putchar(char c) - local_irq_save(flags); - do { } while ((ltq_r32(LTQ_ASC_FSTAT) & TXMASK) >> TXOFFSET); - if (c == '\n') -- ltq_w32('\r', LTQ_ASC_TBUF); -- ltq_w32(c, LTQ_ASC_TBUF); -+ ltq_w8('\r', LTQ_ASC_TBUF); -+ ltq_w8(c, LTQ_ASC_TBUF); - local_irq_restore(flags); - } --- -1.7.5.4 - |