Compile problem due to compressor changes, UART referenced in section .txt

[Mike Rapoport]

Russell King - ARM Linux wrote:
> On Sun, Mar 07, 2010 at 05:19:08PM +0000, J.I. Cameron wrote:
>> Dear  All,
>>
>> Ran into the following problem on a pxa stargate2 platform (I think it will
>> effect a number of others).
>>
>> `UART' referenced in section `.text' of arch/arm/boot/compressed/misc.o:  
>> defined in discarded section `.data' of arch/arm/boot/compressed/misc.o  
>> `UART' referenced in section `.text' of arch/arm/boot/compressed/misc.o:  
>> defined in discarded section `.data' of arch/arm/boot/compressed/misc.o
>>
>> There is a hack in mach-pxa/include/mach/uncompress.h
>> that changes the primary uart for some platforms:
>>
>> static inline void arch_decomp_setup(void)
>> {
>> 	if (machine_is_littleton() || machine_is_intelmote2()
>> 	    || machine_is_csb726() || machine_is_stargate2()
>> 	  || machine_is_cm_x300() || machine_is_balloon3())
>> 	UART = STUART;
> 
> 	else
> 		UART = FFUART;
> 
> and remove the initializer from UART.

Something like that:

Signed-off-by: Mike Rapoport <mike at compulab.co.il>
---
  arch/arm/mach-pxa/include/mach/uncompress.h |    4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-pxa/include/mach/uncompress.h b/arch/arm/mach-pxa/include/mach/uncompress.h
index 237734b..b009299 100644
--- a/arch/arm/mach-pxa/include/mach/uncompress.h
+++ b/arch/arm/mach-pxa/include/mach/uncompress.h
@@ -15,7 +15,7 @@

  #define __REG(x)       ((volatile unsigned long *)x)

-static volatile unsigned long *UART = FFUART;
+static volatile unsigned long *UART;

  static inline void putc(char c)
  {
@@ -39,6 +39,8 @@ static inline void arch_decomp_setup(void)
  	    || machine_is_csb726() || machine_is_stargate2()
  	    || machine_is_cm_x300() || machine_is_balloon3())
  		UART = STUART;
+	else
+		UART = FFUART;
  }

  /*
-- 
1.6.4.4



> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel


-- 
Sincerely yours,
Mike.