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

Commit 53f67545 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Russell King
Browse files

ARM: 8542/1: decompressor: merge piggy.*.S and simplify Makefile 



The files piggy.$(suffix).S are similar enough to be merged into a
single file.  This also allows clean up of the Makefile.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b0b6abe5

arch/arm/boot/compressed/.gitignore

+1 −5
Original line number Diff line number Diff line
@@ -3,11 +3,7 @@ bswapsdi2.S 
font.c

lib1funcs.S

hyp-stub.S

piggy.gzip

piggy.lzo

piggy.lzma

piggy.xzkern

piggy.lz4

piggy_data

vmlinux

vmlinux.lds

arch/arm/boot/compressed/Makefile

+6 −8
Original line number Diff line number Diff line
@@ -89,14 +89,12 @@ ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y) 
OBJS	+= $(libfdt_objs) atags_to_fdt.o

endif



targets       := vmlinux vmlinux.lds \

		 piggy.$(suffix_y) piggy.$(suffix_y).o \

targets       := vmlinux vmlinux.lds piggy_data piggy.o \

		 lib1funcs.o ashldi3.o bswapsdi2.o \

		 head.o $(OBJS)



clean-files += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern piggy.lz4 \

		 lib1funcs.S ashldi3.S bswapsdi2.S $(libfdt) $(libfdt_hdrs) \

		 hyp-stub.S

clean-files += piggy_data lib1funcs.S ashldi3.S bswapsdi2.S \

		$(libfdt) $(libfdt_hdrs) hyp-stub.S



KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
@@ -168,17 +166,17 @@ fi 


efi-obj-$(CONFIG_EFI_STUB) := $(objtree)/drivers/firmware/efi/libstub/lib.a



$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \

$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \

		$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) $(ashldi3) \

		$(bswapsdi2) $(efi-obj-y) FORCE

	@$(check_for_multiple_zreladdr)

	$(call if_changed,ld)

	@$(check_for_bad_syms)



$(obj)/piggy.$(suffix_y): $(obj)/../Image FORCE

$(obj)/piggy_data: $(obj)/../Image FORCE

	$(call if_changed,$(suffix_y))



$(obj)/piggy.$(suffix_y).o:  $(obj)/piggy.$(suffix_y)

$(obj)/piggy.o: $(obj)/piggy_data



CFLAGS_font.o := -Dstatic=

arch/arm/boot/compressed/piggy.gzip.S→arch/arm/boot/compressed/piggy.S

+1 −1
Original line number Diff line number Diff line 
	.section .piggydata,#alloc

	.globl	input_data

input_data:

	.incbin	"arch/arm/boot/compressed/piggy.gzip"

	.incbin	"arch/arm/boot/compressed/piggy_data"

	.globl	input_data_end

input_data_end:

arch/arm/boot/compressed/piggy.lz4.S

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
	.section .piggydata,#alloc

	.globl	input_data

input_data:

	.incbin	"arch/arm/boot/compressed/piggy.lz4"

	.globl	input_data_end

input_data_end:

arch/arm/boot/compressed/piggy.lzma.S

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
	.section .piggydata,#alloc

	.globl	input_data

input_data:

	.incbin	"arch/arm/boot/compressed/piggy.lzma"

	.globl	input_data_end

input_data_end: