From: Tony Lindgren <tony@atomide.com>
Date: Fri, 18 Nov 2005 00:52:52 +0000 (-0800)
Subject: Merge with /home/tmlind/src/kernel/linux-2.6
X-Git-Tag: v2.6.15-omap2~86
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=995396f3c504767a88eb1ccacd48f3bb89cd21ef;p=linux-2.6-omap-h63xx.git

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

995396f3c504767a88eb1ccacd48f3bb89cd21ef
diff --cc arch/arm/boot/compressed/head.S
index 029c5d3f132,6abafb6f184..44dc7f9023e
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@@ -32,40 -33,15 +33,29 @@@
  		senduart \ch, \rb
  		.endm
  
- #if defined(CONFIG_FOOTBRIDGE) || \
-     defined(CONFIG_ARCH_RPC) || \
-     defined(CONFIG_ARCH_INTEGRATOR) || \
-     defined(CONFIG_ARCH_PXA) || \
-     defined(CONFIG_ARCH_IXP4XX) || \
-     defined(CONFIG_ARCH_IXP2000) || \
-     defined(CONFIG_ARCH_LH7A40X) || \
-     defined(CONFIG_ARCH_OMAP)
- 		.macro	loadsp,	rb
- 		addruart \rb
- 		.endm
- #elif defined(CONFIG_ARCH_SA1100)
+ #if defined(CONFIG_ARCH_SA1100)
  		.macro	loadsp, rb
  		mov	\rb, #0x80000000	@ physical base address
- #  if defined(CONFIG_DEBUG_LL_SER3)
+ #ifdef CONFIG_DEBUG_LL_SER3
  		add	\rb, \rb, #0x00050000	@ Ser3
- #  else
+ #else
  		add	\rb, \rb, #0x00010000	@ Ser1
- #  endif
+ #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