Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51aa87be authored Jul 23, 2010 by Uwe Kleine-König Committed by Russell King Jul 26, 2010

ARM: 6263/1: ns9xxx: fix FTBFS for zImage



the different putc variants used an initialized local static variable
which is broken since

	5de813b6 (ARM: Eliminate decompressor -Dstatic= PIC hack)

This needs to be initialized at runtime and so needs to be global.
While at it give it a better name.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 73bcc76a

arch/arm/mach-ns9xxx/include/mach/uncompress.h

+15 −15

Original line number	Diff line number	Diff line
		@@ -20,50 +20,49 @@ static void putc_dummy(char c, void __iomem *base)
		/* nothing */
		}

		static int timeout;

		static void putc_ns9360(char c, void __iomem *base)
		{
		static int t = 0x10000;
		do {
		if (t)
		--t;
		if (timeout)
		--timeout;

		if (__raw_readl(base + 8) & (1 << 3)) {
		__raw_writeb(c, base + 16);
		t = 0x10000;
		timeout = 0x10000;
		break;
		}
		} while (t);
		} while (timeout);
		}

		static void putc_a9m9750dev(char c, void __iomem *base)
		{
		static int t = 0x10000;
		do {
		if (t)
		--t;
		if (timeout)
		--timeout;

		if (__raw_readb(base + 5) & (1 << 5)) {
		__raw_writeb(c, base);
		t = 0x10000;
		timeout = 0x10000;
		break;
		}
		} while (t);
		} while (timeout);

		}

		static void putc_ns921x(char c, void __iomem *base)
		{
		static int t = 0x10000;
		do {
		if (t)
		--t;
		if (timeout)
		--timeout;

		if (!(__raw_readl(base) & (1 << 11))) {
		__raw_writeb(c, base + 0x0028);
		t = 0x10000;
		timeout = 0x10000;
		break;
		}
		} while (t);
		} while (timeout);
		}

		#define MSCS __REG(0xA0900184)
		@@ -89,6 +88,7 @@ static void putc_ns921x(char c, void __iomem *base)

		static void autodetect(void (*putc)(char, void __iomem ), void __iomem **base)
		{
		timeout = 0x10000;
		if (((__raw_readl(MSCS) >> 16) & 0xfe) == 0x00) {
		/* ns9360 or ns9750 */
		if (NS9360_UART_ENABLED(NS9360_UARTA)) {