Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f12ae6bc authored by Yoshinori Sato's avatar Yoshinori Sato Committed by Paul Mundt
Browse files

sh: Fix up link error on SH-2 zImage with older binutils. 



Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent f2fb4e4f

arch/sh/boot/compressed/Makefile_32

+2 −3
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ $(obj)/vmlinux.bin: vmlinux FORCE 
$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)



LDFLAGS_piggy.o := -r --format binary --oformat elf32-sh-linux -T

OBJCOPYFLAGS += -R .empty_zero_page



$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE

	$(call if_changed,ld)
 
$(obj)/piggy.o: $(obj)/piggy.S $(obj)/vmlinux.bin.gz FORCE

	$(call if_changed,as_o_S)

arch/sh/boot/compressed/Makefile_64

+2 −3
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ $(obj)/vmlinux.bin: vmlinux FORCE 
$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)



LDFLAGS_piggy.o := -r --format binary --oformat elf32-sh64-linux -T

OBJCOPYFLAGS += -R .empty_zero_page



$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE

	$(call if_changed,ld)
 
$(obj)/piggy.o: $(obj)/piggy.S $(obj)/vmlinux.bin.gz FORCE

	$(call if_changed,as_o_S)

arch/sh/boot/compressed/piggy.S

0 → 100644
+8 −0
Original line number Diff line number Diff line 
	.global	input_len, input_data

	.data

input_len:

	.long	input_data_end - input_data

input_data:

	.incbin	"arch/sh/boot/compressed/vmlinux.bin.gz"

input_data_end:

	.end

arch/sh/boot/compressed/vmlinux.scr

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
SECTIONS

{

  .data : { 

	input_len = .;

	LONG(input_data_end - input_data) input_data = .; 

	*(.data) 

	input_data_end = .; 

	}

}