From mboxrd@z Thu Jan 1 00:00:00 1970 From: shc_work@mail.ru (Alexander Shiyan) Date: Sat, 21 Apr 2012 13:11:25 +0400 Subject: [PATCH 12/17] ARM clps711x: Simple optimise debug_macro by removing one NOP In-Reply-To: <1334999490-27177-1-git-send-email-shc_work@mail.ru> References: <1334999490-27177-1-git-send-email-shc_work@mail.ru> Message-ID: <1334999490-27177-13-git-send-email-shc_work@mail.ru> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Signed-off-by: Alexander Shiyan --- arch/arm/mach-clps711x/include/mach/debug-macro.S | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-clps711x/include/mach/debug-macro.S b/arch/arm/mach-clps711x/include/mach/debug-macro.S index 118b3d9..37c4d8a 100644 --- a/arch/arm/mach-clps711x/include/mach/debug-macro.S +++ b/arch/arm/mach-clps711x/include/mach/debug-macro.S @@ -14,10 +14,8 @@ #include .macro addruart, rp, rv, tmp -#ifndef CONFIG_DEBUG_CLPS711X_UART2 - mov \rp, #0x0000 @ UART1 -#else - mov \rp, #0x1000 @ UART2 +#ifdef CONFIG_DEBUG_CLPS711X_UART2 + mov \rp, #0x1000 @ Add offset for UART2 base reg #endif orr \rv, \rp, #CLPS711X_VIRT_BASE orr \rp, \rp, #CLPS711X_PHYS_BASE -- 1.7.3.4