[ARM PATCH] 2133/1: params_phys is not available on PXA and apears to be ARCH_RPM...

Patch from Ian Campbell

Arecent changeset[0] that changed params into an asm function call
broke the PXA build since PXA does not define PARAMS_PHYS therefore
the params_phys variable is never defined and linking arch/arm/boot/compressed/head.S fails.

The function is defined in include/asm-arm/arch-rpc/uncompress.h
and so I assume it is dependendant on CONFIG_ARCH_RPC. I can't find
any use of it outside this file.

Signed-off-by: Ian Campbell

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 3af3a55d823d8512ef277a6e1d6a5bd009795195..024cfb021afff17b27cd99d0c0490750bd126b86 100644 (file)
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -349,11 +349,13 @@ LC0:              .word   LC0                     @ r1
 LC1:           .word   reloc_end - reloc_start
                .size   LC0, . - LC0
 
+#ifdef CONFIG_ARCH_RPC
                .globl  params
 params:                ldr     r0, =params_phys
                mov     pc, lr
                .ltorg
                .align
+#endif
 
 /*
  * Turn on the cache.  We need to setup some page tables so that we