* Tony Lindgren <[email protected]> [110106 11:52]: > --- a/arch/arm/boot/compressed/head.S > +++ b/arch/arm/boot/compressed/head.S > @@ -71,6 +71,23 @@ wait: mrc p14, 0, pc, c0, c1, 0 > mov \rb, #0x50000000 > add \rb, \rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT > .endm > +#elif defined(CONFIG_ARCH_OMAP2PLUS) > +#include <plat/multi.h> > +#ifdef MULTI_OMAP2) ^ Looks like my last change to this patch from if defined to ifdef broke the warning above with an unbalanced bracket..
Thanks Nishant for catching that, updated patch below. Regards, Tony From: Tony Lindgren <[email protected]> Date: Thu, 6 Jan 2011 11:29:39 -0800 Subject: [PATCH] ARM: Fix low-level decompress debug code for omap If DEBUG is enabled for decompress code, the system will hang as the debug UART is not specified. Fix this by adding the necessary code for omap2plus. Note that this won't work properly with multi-omap support compiled in. Also the debug UART used needs to be patched in if not omap UART3. Signed-off-by: Tony Lindgren <[email protected]> --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -71,6 +71,23 @@ wait: mrc p14, 0, pc, c0, c1, 0 mov \rb, #0x50000000 add \rb, \rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT .endm +#elif defined(CONFIG_ARCH_OMAP2PLUS) +#include <plat/multi.h> +#ifdef MULTI_OMAP2 +#error Low-level uncompress debug code won't work with multi-omap +#elif defined(CONFIG_ARCH_OMAP2) + .macro loadsp, rb, tmp + ldr \rb, =OMAP2_UART3_BASE /* patch accordingly */ + .endm +#elif defined(CONFIG_ARCH_OMAP3) + .macro loadsp, rb, tmp + ldr \rb, =OMAP3_UART3_BASE /* patch accordingly */ + .endm +#elif defined(CONFIG_ARCH_OMAP4) + .macro loadsp, rb, tmp + ldr \rb, =OMAP4_UART3_BASE /* patch accordingly */ + .endm +#endif #else .macro loadsp, rb, tmp addruart \rb, \tmp -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
