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

Commit 56818a6f authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc: rename piggyback_32 to piggyback 



Now that we use the same piggyback for 32 and 64 bit
we can drop the _32 suffix.
Include some trivial unification in the Makefile
now that 32 and 64 bit can share the same piggyback command.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1075c4ef

arch/sparc/boot/Makefile

+6 −14
Original line number Original line Diff line number Diff line
@@ -6,16 +6,16 @@ 
ROOT_IMG	:= /usr/src/root.img

ROOT_IMG	:= /usr/src/root.img

ELFTOAOUT	:= elftoaout

ELFTOAOUT	:= elftoaout





hostprogs-y	:= piggyback_32 btfixupprep

hostprogs-y	:= piggyback btfixupprep

targets		:= tftpboot.img btfix.o btfix.S image zImage vmlinux.aout

targets		:= tftpboot.img btfix.o btfix.S image zImage vmlinux.aout

clean-files	:= System.map

clean-files	:= System.map





quiet_cmd_elftoaout	= ELFTOAOUT $@

quiet_cmd_elftoaout	= ELFTOAOUT $@

      cmd_elftoaout	= $(ELFTOAOUT) $(obj)/image -o $@

      cmd_elftoaout	= $(ELFTOAOUT) $(obj)/image -o $@

quiet_cmd_piggy		= PIGGY   $@

      cmd_piggy		= $(obj)/piggyback $(BITS) $@ System.map $(ROOT_IMG)





ifeq ($(CONFIG_SPARC32),y)

ifeq ($(CONFIG_SPARC32),y)

quiet_cmd_piggy		= PIGGY   $@

      cmd_piggy		= $(obj)/piggyback_32 $(BITS) $@ System.map $(ROOT_IMG)

quiet_cmd_btfix		= BTFIX   $@

quiet_cmd_btfix		= BTFIX   $@

      cmd_btfix		= $(OBJDUMP) -x vmlinux | $(obj)/btfixupprep > $@

      cmd_btfix		= $(OBJDUMP) -x vmlinux | $(obj)/btfixupprep > $@

quiet_cmd_sysmap        = SYSMAP  $(obj)/System.map

quiet_cmd_sysmap        = SYSMAP  $(obj)/System.map
@@ -58,18 +58,12 @@ $(obj)/image: $(obj)/btfix.o FORCE 
$(obj)/zImage: $(obj)/image

$(obj)/zImage: $(obj)/image

	$(call if_changed,strip)

	$(call if_changed,strip)





$(obj)/tftpboot.img: $(obj)/image $(obj)/piggyback_32 System.map $(ROOT_IMG) FORCE

	$(call if_changed,elftoaout)

	$(call if_changed,piggy)



$(obj)/btfix.S: $(obj)/btfixupprep vmlinux FORCE

$(obj)/btfix.S: $(obj)/btfixupprep vmlinux FORCE

	$(call if_changed,btfix)

	$(call if_changed,btfix)





endif

endif





ifeq ($(CONFIG_SPARC64),y)

ifeq ($(CONFIG_SPARC64),y)

quiet_cmd_piggy     = PIGGY   $@

      cmd_piggy     = $(obj)/piggyback_32 $(BITS) $@ System.map $(ROOT_IMG)

quiet_cmd_strip     = STRIP   $@

quiet_cmd_strip     = STRIP   $@

      cmd_strip     = $(STRIP) -R .comment -R .note -K sun4u_init -K _end -K _start vmlinux -o $@

      cmd_strip     = $(STRIP) -R .comment -R .note -K sun4u_init -K _end -K _start vmlinux -o $@
@@ -82,13 +76,11 @@ $(obj)/image: vmlinux FORCE 
$(obj)/zImage: $(obj)/image

$(obj)/zImage: $(obj)/image

	$(call if_changed,gzip)

	$(call if_changed,gzip)





$(obj)/tftpboot.img: $(obj)/image $(obj)/piggyback_32 System.map $(ROOT_IMG) FORCE

	$(call if_changed,elftoaout)

	$(call if_changed,piggy)

	@echo '  kernel: $@ is ready'



$(obj)/vmlinux.aout: vmlinux FORCE

$(obj)/vmlinux.aout: vmlinux FORCE

	$(call if_changed,elftoaout)

	$(call if_changed,elftoaout)

	@echo '  kernel: $@ is ready'

	@echo '  kernel: $@ is ready'

endif

endif





$(obj)/tftpboot.img: $(obj)/image $(obj)/piggyback System.map $(ROOT_IMG) FORCE

	$(call if_changed,elftoaout)

	$(call if_changed,piggy)