From 56ba7527fb66174c221a05aa81388ddec93980f3 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Tue, 21 Aug 2012 20:59:34 +0400 Subject: [PATCH] --- yaml --- r: 326953 b: refs/heads/master c: 7255f87a7169689be2d4722375744a1f932d4b28 h: refs/heads/master i: 326951: ee51b755302ba388c1f755096d17b07656a955c4 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-clps711x/include/mach/debug-macro.S | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 82a756c5c2df..9b274be89aed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61ae48c3cb6bcffd1c7e18164c3d103eb62f06aa +refs/heads/master: 7255f87a7169689be2d4722375744a1f932d4b28 diff --git a/trunk/arch/arm/mach-clps711x/include/mach/debug-macro.S b/trunk/arch/arm/mach-clps711x/include/mach/debug-macro.S index 118b3d930573..cb3684f8dae0 100644 --- a/trunk/arch/arm/mach-clps711x/include/mach/debug-macro.S +++ b/trunk/arch/arm/mach-clps711x/include/mach/debug-macro.S @@ -28,17 +28,11 @@ .endm .macro waituart,rd,rx -1001: ldr \rd, [\rx, #0x0140] @ SYSFLGx - tst \rd, #1 << 11 @ UBUSYx - bne 1001b .endm .macro busyuart,rd,rx - tst \rx, #0x1000 @ UART2 does not have CTS here - bne 1002f 1001: ldr \rd, [\rx, #0x0140] @ SYSFLGx - tst \rd, #1 << 8 @ CTS + tst \rd, #1 << 11 @ UBUSYx bne 1001b -1002: .endm