diff options
| -rw-r--r-- | arch/arm/boot/compressed/Makefile | 7 | ||||
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 541944894734..2a80c9de6eaf 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile | |||
| @@ -79,16 +79,11 @@ endif | |||
| 79 | EXTRA_CFLAGS := -fpic -fno-builtin | 79 | EXTRA_CFLAGS := -fpic -fno-builtin |
| 80 | EXTRA_AFLAGS := -Wa,-march=all | 80 | EXTRA_AFLAGS := -Wa,-march=all |
| 81 | 81 | ||
| 82 | # Supply ZRELADDR and PARAMS_PHYS to the decompressor via linker symbols. We | 82 | # Supply ZRELADDR to the decompressor via a linker symbol. |
| 83 | # only define params_phys if the machine class defined the corresponding | ||
| 84 | # makefile variable. | ||
| 85 | LDFLAGS_vmlinux := --defsym zreladdr=$(ZRELADDR) | 83 | LDFLAGS_vmlinux := --defsym zreladdr=$(ZRELADDR) |
| 86 | ifeq ($(CONFIG_CPU_ENDIAN_BE8),y) | 84 | ifeq ($(CONFIG_CPU_ENDIAN_BE8),y) |
| 87 | LDFLAGS_vmlinux += --be8 | 85 | LDFLAGS_vmlinux += --be8 |
| 88 | endif | 86 | endif |
| 89 | ifneq ($(PARAMS_PHYS),) | ||
| 90 | LDFLAGS_vmlinux += --defsym params_phys=$(PARAMS_PHYS) | ||
| 91 | endif | ||
| 92 | # ? | 87 | # ? |
| 93 | LDFLAGS_vmlinux += -p | 88 | LDFLAGS_vmlinux += -p |
| 94 | # Report unresolved symbol references | 89 | # Report unresolved symbol references |
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index f61c76e43f7f..d27faa131796 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 | |||
| 321 | 321 | ||
| 322 | #ifdef CONFIG_ARCH_RPC | 322 | #ifdef CONFIG_ARCH_RPC |
| 323 | .globl params | 323 | .globl params |
| 324 | params: ldr r0, =params_phys | 324 | params: ldr r0, =0x10000100 @ params_phys for RPC |
| 325 | mov pc, lr | 325 | mov pc, lr |
| 326 | .ltorg | 326 | .ltorg |
| 327 | .align | 327 | .align |
