Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 201695
b: refs/heads/master
c: db7b2b4
h: refs/heads/master
i:
  201693: 7422001
  201691: 2c7032c
  201687: 30fec19
  201679: 9379210
  201663: af45f77
v: v3
  • Loading branch information
Eric Miao authored and Uwe Kleine-König committed Jul 7, 2010
1 parent 5014672 commit 96c4f83
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 73a65b3f8587fa1c83768515ecc0bf6fa44ccdd1
refs/heads/master: db7b2b4b0e0513627420940d3d62be44a37f0524
7 changes: 1 addition & 6 deletions trunk/arch/arm/boot/compressed/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/boot/compressed/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 96c4f83

Please sign in to comment.