summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJonathan Cameron <arm@jic23.retrosnub.co.uk>2010-03-08 20:44:19 +0300
committerEric Miao <eric.y.miao@gmail.com>2010-03-22 07:03:04 +0300
commit2a8ac187e03027a958b289dd8701ca9c013ab096 (patch)
treebf9a4bbed0576f9c6ee3c32edeedf332d6df50ab /arch
parent220bf991b0366cc50a94feede3d7341fa5710ee4 (diff)
downloadlinux-2a8ac187e03027a958b289dd8701ca9c013ab096.tar.xz
[ARM] pxa: fix for variables in uncompress.h being discarded
Due to commit: 5de813b ARM: Eliminate decompressor -Dstatic= PIC hack The data section will be discarded for the decompressor, thus move the static variables into BSS section by initializing them at run time. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-pxa/include/mach/uncompress.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/include/mach/uncompress.h b/arch/arm/mach-pxa/include/mach/uncompress.h
index 5ef91d9d17e4..759b851ec985 100644
--- a/arch/arm/mach-pxa/include/mach/uncompress.h
+++ b/arch/arm/mach-pxa/include/mach/uncompress.h
@@ -16,9 +16,9 @@
#define BTUART_BASE (0x40200000)
#define STUART_BASE (0x40700000)
-static unsigned long uart_base = FFUART_BASE;
-static unsigned int uart_shift = 2;
-static unsigned int uart_is_pxa = 1;
+static unsigned long uart_base;
+static unsigned int uart_shift;
+static unsigned int uart_is_pxa;
static inline unsigned char uart_read(int offset)
{
@@ -56,6 +56,11 @@ static inline void flush(void)
static inline void arch_decomp_setup(void)
{
+ /* initialize to default */
+ uart_base = FFUART_BASE;
+ uart_shift = 2;
+ uart_is_pxa = 1;
+
if (machine_is_littleton() || machine_is_intelmote2()
|| machine_is_csb726() || machine_is_stargate2()
|| machine_is_cm_x300() || machine_is_balloon3())