From 96c4f83d10ccd09f20d265a39a465b80d4893932 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Thu, 3 Jun 2010 15:36:49 +0800 Subject: [PATCH] --- yaml --- r: 201695 b: refs/heads/master c: db7b2b4b0e0513627420940d3d62be44a37f0524 h: refs/heads/master i: 201693: 74220011eeafa6f20d29b590acc24e904ff31870 201691: 2c7032c1d190cd1c1c3e326ceff9c26c82d66f3f 201687: 30fec1934aea974262afce2d2d9d30e21e019924 201679: 937921068a287486a84085d066027c51f53a29a7 201663: af45f771fa7d4d18dec22c11fc2197e695f2abbb v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/compressed/Makefile | 7 +------ trunk/arch/arm/boot/compressed/head.S | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 3317342e6cff..06c24e7d2a59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73a65b3f8587fa1c83768515ecc0bf6fa44ccdd1 +refs/heads/master: db7b2b4b0e0513627420940d3d62be44a37f0524 diff --git a/trunk/arch/arm/boot/compressed/Makefile b/trunk/arch/arm/boot/compressed/Makefile index 541944894734..2a80c9de6eaf 100644 --- a/trunk/arch/arm/boot/compressed/Makefile +++ b/trunk/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/trunk/arch/arm/boot/compressed/head.S b/trunk/arch/arm/boot/compressed/head.S index f61c76e43f7f..d27faa131796 100644 --- a/trunk/arch/arm/boot/compressed/head.S +++ b/trunk/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