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

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

sparc,sparc64: unify boot/ 



Simple unification:
o renamed piggyback to *_32.c/*_64.c
o copied content of Makefile from sparc64 to sparc and guard it
o updated sparc/boot/.gitignore
o deleted remaining files in sparc64/boot

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

arch/sparc/Makefile

+4 −5
Original line number Diff line number Diff line
@@ -89,17 +89,16 @@ ifdef CONFIG_KALLSYMS 
export kallsyms.o := .tmp_kallsyms2.o

endif



boot-y                 := arch/sparc/boot

boot-$(CONFIG_SPARC64) := arch/sparc64/boot

boot := arch/sparc/boot



image zImage tftpboot.img vmlinux.aout: vmlinux

	$(Q)$(MAKE) $(build)=$(boot-y) $(boot-y)/$@

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



archclean:

	$(Q)$(MAKE) $(clean)=$(boot-y)

	$(Q)$(MAKE) $(clean)=$(boot)



# This is the image used for packaging

KBUILD_IMAGE := $(boot-y)/zImage

KBUILD_IMAGE := $(boot)/zImage



# Don't use tabs in echo arguments.

ifeq ($(ARCH),sparc)

arch/sparc/boot/.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -2,4 +2,7 @@ btfix.S 
btfixupprep

image

zImage

tftpboot.img

vmlinux.aout

piggyback

arch/sparc/boot/Makefile

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

ELFTOAOUT	:= elftoaout



hostprogs-y	:= piggyback btfixupprep

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

hostprogs-y	:= piggyback_32 piggyback_64 btfixupprep

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

clean-files	:= System.map



quiet_cmd_elftoaout	= ELFTOAOUT $@

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



ifeq ($(CONFIG_SPARC32),y)

quiet_cmd_piggy		= PIGGY   $@

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

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

quiet_cmd_btfix		= BTFIX   $@

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

quiet_cmd_sysmap        = SYSMAP  $(obj)/System.map
@@ -62,3 +64,28 @@ $(obj)/tftpboot.img: $(obj)/piggyback $(obj)/System.map $(obj)/image FORCE 


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

	$(call if_changed,btfix)



endif



ifeq ($(CONFIG_SPARC64),y)

quiet_cmd_piggy     = PIGGY   $@

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

quiet_cmd_strip     = STRIP   $@

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





# Actual linking

$(obj)/image: vmlinux FORCE

	$(call if_changed,strip)

	@echo '  kernel: $@ is ready'



$(obj)/tftpboot.img: vmlinux $(obj)/piggyback_64 System.map $(ROOT_IMG) FORCE

	$(call if_changed,elftoaout)

	$(call if_changed,piggy)

	@echo '  kernel: $@ is ready'



$(obj)/vmlinux.aout: vmlinux FORCE

	$(call if_changed,elftoaout)

	@echo '  kernel: $@ is ready'

endif