diff --git a/[refs] b/[refs]
index 4e8866ef763c..010e97b4a0d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91a9fec022f5d98835e27d5307d487da3798040c
+refs/heads/master: 2e9bb084e85d7c160586faf91677a0d7798f1596
diff --git a/trunk/arch/arm/Kconfig.debug b/trunk/arch/arm/Kconfig.debug
index 4f9760bd234e..d9d8effe67f5 100644
--- a/trunk/arch/arm/Kconfig.debug
+++ b/trunk/arch/arm/Kconfig.debug
@@ -376,6 +376,7 @@ endchoice
 config DEBUG_LL_INCLUDE
 	string
 	default "debug/icedcc.S" if DEBUG_ICEDCC
+	default "debug/highbank.S" if DEBUG_HIGHBANK_UART
 	default "mach/debug-macro.S"
 
 config EARLY_PRINTK
diff --git a/trunk/arch/arm/mach-highbank/include/mach/debug-macro.S b/trunk/arch/arm/include/debug/highbank.S
similarity index 83%
rename from trunk/arch/arm/mach-highbank/include/mach/debug-macro.S
rename to trunk/arch/arm/include/debug/highbank.S
index cb57fe5bcd04..8cad4322a5a2 100644
--- a/trunk/arch/arm/mach-highbank/include/mach/debug-macro.S
+++ b/trunk/arch/arm/include/debug/highbank.S
@@ -10,10 +10,8 @@
  */
 
 		.macro	addruart,rp,rv,tmp
-		movw	\rv, #0x6000
-		movt	\rv, #0xfee3
-		movw	\rp, #0x6000
-		movt	\rp, #0xfff3
+		ldr	\rv, =0xfee36000
+		ldr	\rp, =0xfff36000
 		.endm
 
 #include <asm/hardware/debug-pl01x.S>