summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorEric Miao <eric.y.miao@gmail.com>2010-06-03 15:36:49 +0800
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-07-07 16:38:37 +0200
commitdb7b2b4b0e0513627420940d3d62be44a37f0524 (patch)
treeb12ce8c22edf3db2dc44886d80704536b53def73 /arch
parent73a65b3f8587fa1c83768515ecc0bf6fa44ccdd1 (diff)
downloadop-kernel-dev-db7b2b4b0e0513627420940d3d62be44a37f0524.zip
op-kernel-dev-db7b2b4b0e0513627420940d3d62be44a37f0524.tar.gz
ARM: Remove unused PARAMS_PHYS from arch/arm/boot/compressed
The only reference in arch/arm/boot/compressed to PARAMS_PHYS is params() in head.S, which can be directly converted to the exact address as specified by arch/arm/mach-rpc/Makefile.boot. Signed-off-by: Eric Miao <eric.miao@canonical.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/compressed/Makefile7
-rw-r--r--arch/arm/boot/compressed/head.S2
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 5419448..2a80c9d 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -79,16 +79,11 @@ endif
EXTRA_CFLAGS := -fpic -fno-builtin
EXTRA_AFLAGS := -Wa,-march=all
-# Supply ZRELADDR and PARAMS_PHYS to the decompressor via linker symbols. We
-# only define params_phys if the machine class defined the corresponding
-# makefile variable.
+# Supply ZRELADDR to the decompressor via a linker symbol.
LDFLAGS_vmlinux := --defsym zreladdr=$(ZRELADDR)
ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)
LDFLAGS_vmlinux += --be8
endif
-ifneq ($(PARAMS_PHYS),)
-LDFLAGS_vmlinux += --defsym params_phys=$(PARAMS_PHYS)
-endif
# ?
LDFLAGS_vmlinux += -p
# Report unresolved symbol references
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index f61c76e..d27faa1 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -321,7 +321,7 @@ LC1: .word reloc_end - reloc_start
#ifdef CONFIG_ARCH_RPC
.globl params
-params: ldr r0, =params_phys
+params: ldr r0, =0x10000100 @ params_phys for RPC
mov pc, lr
.ltorg
.align
OpenPOWER on IntegriCloud