Skip to content

Commit 53f6754

Browse files
masahir0yRussell King
masahir0y
authored and
Russell King
committed
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>
1 parent b0b6abe commit 53f6754

File tree

7 files changed

+8
-38
lines changed

7 files changed

+8
-38
lines changed

‎arch/arm/boot/compressed/.gitignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ bswapsdi2.S
33
font.c
44
lib1funcs.S
55
hyp-stub.S
6-
piggy.gzip
7-
piggy.lzo
8-
piggy.lzma
9-
piggy.xzkern
10-
piggy.lz4
6+
piggy_data
117
vmlinux
128
vmlinux.lds
139

‎arch/arm/boot/compressed/Makefile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,12 @@ ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y)
8989
OBJS += $(libfdt_objs) atags_to_fdt.o
9090
endif
9191

92-
targets := vmlinux vmlinux.lds \
93-
piggy.$(suffix_y) piggy.$(suffix_y).o \
92+
targets := vmlinux vmlinux.lds piggy_data piggy.o \
9493
lib1funcs.o ashldi3.o bswapsdi2.o \
9594
head.o $(OBJS)
9695

97-
clean-files += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern piggy.lz4 \
98-
lib1funcs.S ashldi3.S bswapsdi2.S $(libfdt) $(libfdt_hdrs) \
99-
hyp-stub.S
96+
clean-files += piggy_data lib1funcs.S ashldi3.S bswapsdi2.S \
97+
$(libfdt) $(libfdt_hdrs) hyp-stub.S
10098

10199
KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
102100

@@ -168,17 +166,17 @@ fi
168166

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

171-
$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \
169+
$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \
172170
$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) $(ashldi3) \
173171
$(bswapsdi2) $(efi-obj-y) FORCE
174172
@$(check_for_multiple_zreladdr)
175173
$(call if_changed,ld)
176174
@$(check_for_bad_syms)
177175

178-
$(obj)/piggy.$(suffix_y): $(obj)/../Image FORCE
176+
$(obj)/piggy_data: $(obj)/../Image FORCE
179177
$(call if_changed,$(suffix_y))
180178

181-
$(obj)/piggy.$(suffix_y).o: $(obj)/piggy.$(suffix_y)
179+
$(obj)/piggy.o: $(obj)/piggy_data
182180

183181
CFLAGS_font.o := -Dstatic=
184182

‎arch/arm/boot/compressed/piggy.gzip.S renamed to ‎arch/arm/boot/compressed/piggy.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.section .piggydata,#alloc
22
.globl input_data
33
input_data:
4-
.incbin "arch/arm/boot/compressed/piggy.gzip"
4+
.incbin "arch/arm/boot/compressed/piggy_data"
55
.globl input_data_end
66
input_data_end:

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

Lines changed: 0 additions & 6 deletions
This file was deleted.

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

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎arch/arm/boot/compressed/piggy.lzo.S

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎arch/arm/boot/compressed/piggy.xzkern.S

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)