Commit 2a8ac187 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Eric Miao

[ARM] pxa: fix for variables in uncompress.h being discarded

Due to commit:

    5de813b6  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: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 220bf991
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
#define BTUART_BASE (0x40200000) #define BTUART_BASE (0x40200000)
#define STUART_BASE (0x40700000) #define STUART_BASE (0x40700000)
static unsigned long uart_base = FFUART_BASE; static unsigned long uart_base;
static unsigned int uart_shift = 2; static unsigned int uart_shift;
static unsigned int uart_is_pxa = 1; static unsigned int uart_is_pxa;
static inline unsigned char uart_read(int offset) static inline unsigned char uart_read(int offset)
{ {
...@@ -56,6 +56,11 @@ static inline void flush(void) ...@@ -56,6 +56,11 @@ static inline void flush(void)
static inline void arch_decomp_setup(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() if (machine_is_littleton() || machine_is_intelmote2()
|| machine_is_csb726() || machine_is_stargate2() || machine_is_csb726() || machine_is_stargate2()
|| machine_is_cm_x300() || machine_is_balloon3()) || machine_is_cm_x300() || machine_is_balloon3())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment