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: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>hifive-unleashed-5.1
parent
b0b6abe5fd
commit
53f67545c2
|
@ -3,11 +3,7 @@ bswapsdi2.S
|
||||||
font.c
|
font.c
|
||||||
lib1funcs.S
|
lib1funcs.S
|
||||||
hyp-stub.S
|
hyp-stub.S
|
||||||
piggy.gzip
|
piggy_data
|
||||||
piggy.lzo
|
|
||||||
piggy.lzma
|
|
||||||
piggy.xzkern
|
|
||||||
piggy.lz4
|
|
||||||
vmlinux
|
vmlinux
|
||||||
vmlinux.lds
|
vmlinux.lds
|
||||||
|
|
||||||
|
|
|
@ -89,14 +89,12 @@ ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y)
|
||||||
OBJS += $(libfdt_objs) atags_to_fdt.o
|
OBJS += $(libfdt_objs) atags_to_fdt.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
targets := vmlinux vmlinux.lds \
|
targets := vmlinux vmlinux.lds piggy_data piggy.o \
|
||||||
piggy.$(suffix_y) piggy.$(suffix_y).o \
|
|
||||||
lib1funcs.o ashldi3.o bswapsdi2.o \
|
lib1funcs.o ashldi3.o bswapsdi2.o \
|
||||||
head.o $(OBJS)
|
head.o $(OBJS)
|
||||||
|
|
||||||
clean-files += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern piggy.lz4 \
|
clean-files += piggy_data lib1funcs.S ashldi3.S bswapsdi2.S \
|
||||||
lib1funcs.S ashldi3.S bswapsdi2.S $(libfdt) $(libfdt_hdrs) \
|
$(libfdt) $(libfdt_hdrs) hyp-stub.S
|
||||||
hyp-stub.S
|
|
||||||
|
|
||||||
KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
|
KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
|
||||||
|
|
||||||
|
@ -168,17 +166,17 @@ fi
|
||||||
|
|
||||||
efi-obj-$(CONFIG_EFI_STUB) := $(objtree)/drivers/firmware/efi/libstub/lib.a
|
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) \
|
$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) $(ashldi3) \
|
||||||
$(bswapsdi2) $(efi-obj-y) FORCE
|
$(bswapsdi2) $(efi-obj-y) FORCE
|
||||||
@$(check_for_multiple_zreladdr)
|
@$(check_for_multiple_zreladdr)
|
||||||
$(call if_changed,ld)
|
$(call if_changed,ld)
|
||||||
@$(check_for_bad_syms)
|
@$(check_for_bad_syms)
|
||||||
|
|
||||||
$(obj)/piggy.$(suffix_y): $(obj)/../Image FORCE
|
$(obj)/piggy_data: $(obj)/../Image FORCE
|
||||||
$(call if_changed,$(suffix_y))
|
$(call if_changed,$(suffix_y))
|
||||||
|
|
||||||
$(obj)/piggy.$(suffix_y).o: $(obj)/piggy.$(suffix_y)
|
$(obj)/piggy.o: $(obj)/piggy_data
|
||||||
|
|
||||||
CFLAGS_font.o := -Dstatic=
|
CFLAGS_font.o := -Dstatic=
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
.section .piggydata,#alloc
|
.section .piggydata,#alloc
|
||||||
.globl input_data
|
.globl input_data
|
||||||
input_data:
|
input_data:
|
||||||
.incbin "arch/arm/boot/compressed/piggy.gzip"
|
.incbin "arch/arm/boot/compressed/piggy_data"
|
||||||
.globl input_data_end
|
.globl input_data_end
|
||||||
input_data_end:
|
input_data_end:
|
|
@ -1,6 +0,0 @@
|
||||||
.section .piggydata,#alloc
|
|
||||||
.globl input_data
|
|
||||||
input_data:
|
|
||||||
.incbin "arch/arm/boot/compressed/piggy.lz4"
|
|
||||||
.globl input_data_end
|
|
||||||
input_data_end:
|
|
|
@ -1,6 +0,0 @@
|
||||||
.section .piggydata,#alloc
|
|
||||||
.globl input_data
|
|
||||||
input_data:
|
|
||||||
.incbin "arch/arm/boot/compressed/piggy.lzma"
|
|
||||||
.globl input_data_end
|
|
||||||
input_data_end:
|
|
|
@ -1,6 +0,0 @@
|
||||||
.section .piggydata,#alloc
|
|
||||||
.globl input_data
|
|
||||||
input_data:
|
|
||||||
.incbin "arch/arm/boot/compressed/piggy.lzo"
|
|
||||||
.globl input_data_end
|
|
||||||
input_data_end:
|
|
|
@ -1,6 +0,0 @@
|
||||||
.section .piggydata,#alloc
|
|
||||||
.globl input_data
|
|
||||||
input_data:
|
|
||||||
.incbin "arch/arm/boot/compressed/piggy.xzkern"
|
|
||||||
.globl input_data_end
|
|
||||||
input_data_end:
|
|
Loading…
Reference in New Issue