Merge with /home/tmlind/src/kernel/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / boot / compressed / head.S

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 6abafb6f1844d9b82a3f74cbfcb3b77486f2e5b8..44dc7f9023e4bb5db78db9499a63914cf590f3e3 100644 (file)
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -42,6 +42,20 @@
                add     \rb, \rb, #0x00010000   @ Ser1
 #endif
                .endm
+#elif defined(CONFIG_ARCH_OMAP2)
+               .macro  loadsp, rb
+               mov     \rb, #0x48000000        @ physical base address
+               add     \rb, \rb, #0x0006a000
+#ifdef CONFIG_OMAP_LL_DEBUG_UART2
+               add     \rb, \rb, #0x00002000
+#endif
+#ifdef CONFIG_OMAP_LL_DEBUG_UART3
+               add     \rb, \rb, #0x00004000
+#endif
+               .endm
+               .macro  writeb, rb
+               strb    \rb, [r3]
+               .endm
 #elif defined(CONFIG_ARCH_IOP331)
                .macro loadsp, rb
                 mov    \rb, #0xff000000