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

Commit 1eca133c authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Merge the split arch/sh/boot/compressed/ Makefiles. 



This kills off the _64 variant and moves the _32 one over as the generic
one to use.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent b2088356

arch/sh/boot/compressed/Makefile

+47 −1
Original line number Diff line number Diff line 
include ${srctree}/arch/sh/boot/compressed/Makefile_32
 
#

# linux/arch/sh/boot/compressed/Makefile

#

# create a compressed vmlinux image from the original vmlinux

#



targets		:= vmlinux vmlinux.bin vmlinux.bin.gz \

		   head_$(BITS).o misc_$(BITS).o piggy.o



OBJECTS = $(obj)/head_$(BITS).o $(obj)/misc_$(BITS).o $(obj)/cache.o



ifdef CONFIG_SH_STANDARD_BIOS

OBJECTS += $(obj)/../../kernel/sh_bios.o

endif



#

# IMAGE_OFFSET is the load offset of the compression loader

#

IMAGE_OFFSET	:= $(shell /bin/bash -c 'printf "0x%08x" \

		     $$[$(CONFIG_PAGE_OFFSET)  + \

			$(KERNEL_MEMORY) + \

			$(CONFIG_BOOT_LINK_OFFSET)]')



LIBGCC	:= $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)



ifeq ($(CONFIG_FUNCTION_TRACER),y)

ORIG_CFLAGS := $(KBUILD_CFLAGS)

KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))

endif



LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(IMAGE_OFFSET) -e startup \

		   -T $(obj)/../../kernel/vmlinux.lds



$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE

	$(call if_changed,ld)

	@:



$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)



OBJCOPYFLAGS += -R .empty_zero_page



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

	$(call if_changed,as_o_S)

arch/sh/boot/compressed/Makefile_32

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
#

# linux/arch/sh/boot/compressed/Makefile

#

# create a compressed vmlinux image from the original vmlinux

#



targets		:= vmlinux vmlinux.bin vmlinux.bin.gz \

		   head_$(BITS).o misc_$(BITS).o piggy.o



OBJECTS = $(obj)/head_$(BITS).o $(obj)/misc_$(BITS).o $(obj)/cache.o



ifdef CONFIG_SH_STANDARD_BIOS

OBJECTS += $(obj)/../../kernel/sh_bios.o

endif



#

# IMAGE_OFFSET is the load offset of the compression loader

#

IMAGE_OFFSET	:= $(shell /bin/bash -c 'printf "0x%08x" \

		     $$[$(CONFIG_PAGE_OFFSET)  + \

			$(KERNEL_MEMORY) + \

			$(CONFIG_BOOT_LINK_OFFSET)]')



LIBGCC	:= $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)



ifeq ($(CONFIG_FUNCTION_TRACER),y)

ORIG_CFLAGS := $(KBUILD_CFLAGS)

KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))

endif



LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(IMAGE_OFFSET) -e startup \

		   -T $(obj)/../../kernel/vmlinux.lds



$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE

	$(call if_changed,ld)

	@:



$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)



OBJCOPYFLAGS += -R .empty_zero_page



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

	$(call if_changed,as_o_S)

arch/sh/boot/compressed/Makefile_64

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
#

# arch/sh/boot/compressed/Makefile_64

#

# create a compressed vmlinux image from the original vmlinux

#

# Copyright (C) 2002 Stuart Menefy

# Copyright (C) 2004 Paul Mundt

#

# This file is subject to the terms and conditions of the GNU General Public

# License.  See the file "COPYING" in the main directory of this archive

# for more details.

#



targets		:= vmlinux vmlinux.bin vmlinux.bin.gz \

		   head_64.o misc_64.o cache.o piggy.o



OBJECTS		:= $(obj)/head_64.o $(obj)/misc_64.o $(obj)/cache.o



#

# ZIMAGE_OFFSET is the load offset of the compression loader

# (4M for the kernel plus 64K for this loader)

#

ZIMAGE_OFFSET	:= $(shell /bin/bash -c 'printf "0x%08x" \

		     $$[$(CONFIG_PAGE_OFFSET)+0x400000+0x10000]')



LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(ZIMAGE_OFFSET) -e startup \

		   -T $(obj)/../../kernel/vmlinux.lds



$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE

	$(call if_changed,ld)

	@:



$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)



OBJCOPYFLAGS += -R .empty_zero_page



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

	$(call if_changed,as_o_S)