diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-12 15:26:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-12 15:26:39 -0800 |
| commit | 7dac7102afbeb99daa454f555f1ea1f42fad2f78 (patch) | |
| tree | 024bf6c2ed2fa46cab610e6012bd3dd5f45da182 /arch/h8300/boot/compressed/Makefile | |
| parent | 3370b69eb0c1f6a05f9051e8fc3e8768461a80f7 (diff) | |
| parent | f639eeb4a60ce39f154753e3a745bd755e0fe084 (diff) | |
| download | talos-obmc-linux-7dac7102afbeb99daa454f555f1ea1f42fad2f78.tar.gz talos-obmc-linux-7dac7102afbeb99daa454f555f1ea1f42fad2f78.zip | |
Merge tag 'for-4.4' of git://git.osdn.jp/gitroot/uclinux-h8/linux
Pull h8300 updates from Yoshinori Sato:
"Some bug fixes"
* tag 'for-4.4' of git://git.osdn.jp/gitroot/uclinux-h8/linux:
h8300: enable CLKSRC_OF
h8300: Don't set CROSS_COMPILE unconditionally
asm-generic: {get,put}_user ptr argument evaluate only 1 time
h8300: bit io fix
h8300: zImage fix
h8300: register address fix
h8300: Fix alignment for .data
h8300: unaligned divcr register support.
Diffstat (limited to 'arch/h8300/boot/compressed/Makefile')
| -rw-r--r-- | arch/h8300/boot/compressed/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/h8300/boot/compressed/Makefile b/arch/h8300/boot/compressed/Makefile index 87d03b7ee97e..d7bc3fa7f2c6 100644 --- a/arch/h8300/boot/compressed/Makefile +++ b/arch/h8300/boot/compressed/Makefile @@ -14,11 +14,12 @@ OBJECTS = $(obj)/head.o $(obj)/misc.o # in order to suppress error message. # CONFIG_MEMORY_START ?= 0x00400000 -CONFIG_BOOT_LINK_OFFSET ?= 0x00140000 +CONFIG_BOOT_LINK_OFFSET ?= 0x00280000 IMAGE_OFFSET := $(shell printf "0x%08x" $$(($(CONFIG_MEMORY_START)+$(CONFIG_BOOT_LINK_OFFSET)))) LIBGCC := $(shell $(CROSS-COMPILE)$(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) -LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -estartup $(obj)/vmlinux.lds +LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -estartup -T $(obj)/vmlinux.lds \ + --defsym output=$(CONFIG_MEMORY_START) $(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE $(call if_changed,ld) |
