diff for duplicates of <20100121190337.GN23467@atomide.com> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 2b3d7f8..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="arm-addruart-extra-reg.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index a664fa1..0000000 --- a/a/2.txt +++ /dev/null @@ -1,154 +0,0 @@ ->From fae696043ad94ce83709ae72564623f42e66488c Mon Sep 17 00:00:00 2001 -From: Tony Lindgren <tony@atomide.com> -Date: Wed, 20 Jan 2010 18:26:32 -0800 -Subject: [PATCH] arm: Add \tmp register for addruart and loadsp - -Otherwise more complicated uart configuration won't be possible. -We can use r1 for tmp register for both head.S and debug.S. - -NOTE: This patch depends on another patch to add the the \tmp register -into all debug-macro.S files. That can be done with: - -$ find arch/arm -name debug-macro.S | xargs -n1 -i sed -i \ --e "s/addruart,rx\|addruart, rx/addruart, rx, tmp/" {} - -Signed-off-by: Tony Lindgren <tony@atomide.com> - -diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S -index 4fddc50..99b75aa 100644 ---- a/arch/arm/boot/compressed/head.S -+++ b/arch/arm/boot/compressed/head.S -@@ -22,13 +22,13 @@ - #if defined(CONFIG_DEBUG_ICEDCC) - - #ifdef CONFIG_CPU_V6 -- .macro loadsp, rb -+ .macro loadsp, rb, tmp - .endm - .macro writeb, ch, rb - mcr p14, 0, \ch, c0, c5, 0 - .endm - #elif defined(CONFIG_CPU_V7) -- .macro loadsp, rb -+ .macro loadsp, rb, tmp - .endm - .macro writeb, ch, rb - wait: mrc p14, 0, pc, c0, c1, 0 -@@ -36,13 +36,13 @@ wait: mrc p14, 0, pc, c0, c1, 0 - mcr p14, 0, \ch, c0, c5, 0 - .endm - #elif defined(CONFIG_CPU_XSCALE) -- .macro loadsp, rb -+ .macro loadsp, rb, tmp - .endm - .macro writeb, ch, rb - mcr p14, 0, \ch, c8, c0, 0 - .endm - #else -- .macro loadsp, rb -+ .macro loadsp, rb, tmp - .endm - .macro writeb, ch, rb - mcr p14, 0, \ch, c1, c0, 0 -@@ -58,7 +58,7 @@ wait: mrc p14, 0, pc, c0, c1, 0 - .endm - - #if defined(CONFIG_ARCH_SA1100) -- .macro loadsp, rb -+ .macro loadsp, rb, tmp - mov \rb, #0x80000000 @ physical base address - #ifdef CONFIG_DEBUG_LL_SER3 - add \rb, \rb, #0x00050000 @ Ser3 -@@ -67,13 +67,13 @@ wait: mrc p14, 0, pc, c0, c1, 0 - #endif - .endm - #elif defined(CONFIG_ARCH_S3C2410) -- .macro loadsp, rb -+ .macro loadsp, rb, tmp - mov \rb, #0x50000000 - add \rb, \rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT - .endm - #else -- .macro loadsp, rb -- addruart \rb -+ .macro loadsp, rb, tmp -+ addruart \rb, \tmp - .endm - #endif - #endif -@@ -1025,7 +1025,7 @@ phex: adr r3, phexbuf - strb r2, [r3, r1] - b 1b - --puts: loadsp r3 -+puts: loadsp r3, r1 - 1: ldrb r2, [r0], #1 - teq r2, #0 - moveq pc, lr -@@ -1042,7 +1042,7 @@ puts: loadsp r3 - putc: - mov r2, r0 - mov r0, #0 -- loadsp r3 -+ loadsp r3, r1 - b 2b - - memdump: mov r12, r0 -diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S -index 5c91add..a38b487 100644 ---- a/arch/arm/kernel/debug.S -+++ b/arch/arm/kernel/debug.S -@@ -24,7 +24,7 @@ - - #if defined(CONFIG_CPU_V6) - -- .macro addruart, rx -+ .macro addruart, rx, tmp - .endm - - .macro senduart, rd, rx -@@ -51,7 +51,7 @@ - - #elif defined(CONFIG_CPU_V7) - -- .macro addruart, rx -+ .macro addruart, rx, tmp - .endm - - .macro senduart, rd, rx -@@ -71,7 +71,7 @@ wait: mrc p14, 0, pc, c0, c1, 0 - - #elif defined(CONFIG_CPU_XSCALE) - -- .macro addruart, rx -+ .macro addruart, rx, tmp - .endm - - .macro senduart, rd, rx -@@ -98,7 +98,7 @@ wait: mrc p14, 0, pc, c0, c1, 0 - - #else - -- .macro addruart, rx -+ .macro addruart, rx, tmp - .endm - - .macro senduart, rd, rx -@@ -164,7 +164,7 @@ ENDPROC(printhex2) - .ltorg - - ENTRY(printascii) -- addruart r3 -+ addruart r3, r1 - b 2f - 1: waituart r2, r3 - senduart r1, r3 -@@ -180,7 +180,7 @@ ENTRY(printascii) - ENDPROC(printascii) - - ENTRY(printch) -- addruart r3 -+ addruart r3, r1 - mov r1, r0 - mov r0, #0 - b 1b diff --git a/a/content_digest b/N1/content_digest index c2d7be4..d6ebf6b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,13 +3,11 @@ "ref\020100116093555.GA13596@n2100.arm.linux.org.uk\0" "ref\020100116191820.GI10318@atomide.com\0" "ref\020100116193313.GA23092@n2100.arm.linux.org.uk\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 2/4] omap: Make uncompress code and DEBUG_LL code generic\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 2/4] omap: Make uncompress code and DEBUG_LL code generic\0" "Date\0Thu, 21 Jan 2010 11:03:38 -0800\0" - "To\0Russell King - ARM Linux <linux@arm.linux.org.uk>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - " linux-omap@vger.kernel.org\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "Hi,\n" "\n" @@ -74,162 +72,5 @@ "Regards,\n" "\n" Tony - "\01:2\0" - "fn\0arm-addruart-extra-reg.patch\0" - "b\0" - ">From fae696043ad94ce83709ae72564623f42e66488c Mon Sep 17 00:00:00 2001\n" - "From: Tony Lindgren <tony@atomide.com>\n" - "Date: Wed, 20 Jan 2010 18:26:32 -0800\n" - "Subject: [PATCH] arm: Add \\tmp register for addruart and loadsp\n" - "\n" - "Otherwise more complicated uart configuration won't be possible.\n" - "We can use r1 for tmp register for both head.S and debug.S.\n" - "\n" - "NOTE: This patch depends on another patch to add the the \\tmp register\n" - "into all debug-macro.S files. That can be done with:\n" - "\n" - "$ find arch/arm -name debug-macro.S | xargs -n1 -i sed -i \\\n" - "-e \"s/addruart,rx\\|addruart, rx/addruart, rx, tmp/\" {}\n" - "\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S\n" - "index 4fddc50..99b75aa 100644\n" - "--- a/arch/arm/boot/compressed/head.S\n" - "+++ b/arch/arm/boot/compressed/head.S\n" - "@@ -22,13 +22,13 @@\n" - " #if defined(CONFIG_DEBUG_ICEDCC)\n" - " \n" - " #ifdef CONFIG_CPU_V6\n" - "-\t\t.macro\tloadsp, rb\n" - "+\t\t.macro\tloadsp, rb, tmp\n" - " \t\t.endm\n" - " \t\t.macro\twriteb, ch, rb\n" - " \t\tmcr\tp14, 0, \\ch, c0, c5, 0\n" - " \t\t.endm\n" - " #elif defined(CONFIG_CPU_V7)\n" - "-\t\t.macro\tloadsp, rb\n" - "+\t\t.macro\tloadsp, rb, tmp\n" - " \t\t.endm\n" - " \t\t.macro\twriteb, ch, rb\n" - " wait:\t\tmrc\tp14, 0, pc, c0, c1, 0\n" - "@@ -36,13 +36,13 @@ wait:\t\tmrc\tp14, 0, pc, c0, c1, 0\n" - " \t\tmcr\tp14, 0, \\ch, c0, c5, 0\n" - " \t\t.endm\n" - " #elif defined(CONFIG_CPU_XSCALE)\n" - "-\t\t.macro\tloadsp, rb\n" - "+\t\t.macro\tloadsp, rb, tmp\n" - " \t\t.endm\n" - " \t\t.macro\twriteb, ch, rb\n" - " \t\tmcr\tp14, 0, \\ch, c8, c0, 0\n" - " \t\t.endm\n" - " #else\n" - "-\t\t.macro\tloadsp, rb\n" - "+\t\t.macro\tloadsp, rb, tmp\n" - " \t\t.endm\n" - " \t\t.macro\twriteb, ch, rb\n" - " \t\tmcr\tp14, 0, \\ch, c1, c0, 0\n" - "@@ -58,7 +58,7 @@ wait:\t\tmrc\tp14, 0, pc, c0, c1, 0\n" - " \t\t.endm\n" - " \n" - " #if defined(CONFIG_ARCH_SA1100)\n" - "-\t\t.macro\tloadsp, rb\n" - "+\t\t.macro\tloadsp, rb, tmp\n" - " \t\tmov\t\\rb, #0x80000000\t@ physical base address\n" - " #ifdef CONFIG_DEBUG_LL_SER3\n" - " \t\tadd\t\\rb, \\rb, #0x00050000\t@ Ser3\n" - "@@ -67,13 +67,13 @@ wait:\t\tmrc\tp14, 0, pc, c0, c1, 0\n" - " #endif\n" - " \t\t.endm\n" - " #elif defined(CONFIG_ARCH_S3C2410)\n" - "-\t\t.macro loadsp, rb\n" - "+\t\t.macro loadsp, rb, tmp\n" - " \t\tmov\t\\rb, #0x50000000\n" - " \t\tadd\t\\rb, \\rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT\n" - " \t\t.endm\n" - " #else\n" - "-\t\t.macro\tloadsp,\trb\n" - "-\t\taddruart \\rb\n" - "+\t\t.macro\tloadsp,\trb, tmp\n" - "+\t\taddruart \\rb, \\tmp\n" - " \t\t.endm\n" - " #endif\n" - " #endif\n" - "@@ -1025,7 +1025,7 @@ phex:\t\tadr\tr3, phexbuf\n" - " \t\tstrb\tr2, [r3, r1]\n" - " \t\tb\t1b\n" - " \n" - "-puts:\t\tloadsp\tr3\n" - "+puts:\t\tloadsp\tr3, r1\n" - " 1:\t\tldrb\tr2, [r0], #1\n" - " \t\tteq\tr2, #0\n" - " \t\tmoveq\tpc, lr\n" - "@@ -1042,7 +1042,7 @@ puts:\t\tloadsp\tr3\n" - " putc:\n" - " \t\tmov\tr2, r0\n" - " \t\tmov\tr0, #0\n" - "-\t\tloadsp\tr3\n" - "+\t\tloadsp\tr3, r1\n" - " \t\tb\t2b\n" - " \n" - " memdump:\tmov\tr12, r0\n" - "diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S\n" - "index 5c91add..a38b487 100644\n" - "--- a/arch/arm/kernel/debug.S\n" - "+++ b/arch/arm/kernel/debug.S\n" - "@@ -24,7 +24,7 @@\n" - " \n" - " #if defined(CONFIG_CPU_V6)\n" - " \n" - "-\t\t.macro\taddruart, rx\n" - "+\t\t.macro\taddruart, rx, tmp\n" - " \t\t.endm\n" - " \n" - " \t\t.macro\tsenduart, rd, rx\n" - "@@ -51,7 +51,7 @@\n" - " \n" - " #elif defined(CONFIG_CPU_V7)\n" - " \n" - "-\t\t.macro\taddruart, rx\n" - "+\t\t.macro\taddruart, rx, tmp\n" - " \t\t.endm\n" - " \n" - " \t\t.macro\tsenduart, rd, rx\n" - "@@ -71,7 +71,7 @@ wait:\t\tmrc\tp14, 0, pc, c0, c1, 0\n" - " \n" - " #elif defined(CONFIG_CPU_XSCALE)\n" - " \n" - "-\t\t.macro\taddruart, rx\n" - "+\t\t.macro\taddruart, rx, tmp\n" - " \t\t.endm\n" - " \n" - " \t\t.macro\tsenduart, rd, rx\n" - "@@ -98,7 +98,7 @@ wait:\t\tmrc\tp14, 0, pc, c0, c1, 0\n" - " \n" - " #else\n" - " \n" - "-\t\t.macro\taddruart, rx\n" - "+\t\t.macro\taddruart, rx, tmp\n" - " \t\t.endm\n" - " \n" - " \t\t.macro\tsenduart, rd, rx\n" - "@@ -164,7 +164,7 @@ ENDPROC(printhex2)\n" - " \t\t.ltorg\n" - " \n" - " ENTRY(printascii)\n" - "-\t\taddruart r3\n" - "+\t\taddruart r3, r1\n" - " \t\tb\t2f\n" - " 1:\t\twaituart r2, r3\n" - " \t\tsenduart r1, r3\n" - "@@ -180,7 +180,7 @@ ENTRY(printascii)\n" - " ENDPROC(printascii)\n" - " \n" - " ENTRY(printch)\n" - "-\t\taddruart r3\n" - "+\t\taddruart r3, r1\n" - " \t\tmov\tr1, r0\n" - " \t\tmov\tr0, #0\n" - " \t\tb\t1b" -bc3be72ffb9b678e70bbcac07e5859ce54c01c3577409a96534aba0d8b2eb237 +7992543e35539e9fb820c4849316d99c13a86690226334a9a389931f927924eb
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.