Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1339169 > unrolled thread

[PATCH 0/6] ARM: decompressor: several cleanups

Started byMasahiro Yamada <yamada.masahiro@socionext.com>
First post2016-02-22 08:40 +0100
Last post2016-02-22 13:40 +0100
Articles 6 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/6] ARM: decompressor: several cleanups Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-02-22 08:40 +0100
    [PATCH 5/6] ARM: decompressor: merge piggy.*.S and simplify Makefile Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-02-22 08:40 +0100
    Re: [PATCH 0/6] ARM: decompressor: several cleanups Russell King - ARM Linux <linux@arm.linux.org.uk> - 2016-02-22 12:40 +0100
      Re: [PATCH 0/6] ARM: decompressor: several cleanups Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-02-22 13:10 +0100
        Re: [PATCH 0/6] ARM: decompressor: several cleanups Russell King - ARM Linux <linux@arm.linux.org.uk> - 2016-02-22 13:20 +0100
          Re: [PATCH 0/6] ARM: decompressor: several cleanups Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-02-22 13:40 +0100

#1339169 — [PATCH 0/6] ARM: decompressor: several cleanups

FromMasahiro Yamada <yamada.masahiro@socionext.com>
Date2016-02-22 08:40 +0100
Subject[PATCH 0/6] ARM: decompressor: several cleanups
Message-ID<r4Tg5-2j1-3@gated-at.bofh.it>


Masahiro Yamada (6):
  ARM: decompressor: drop unneeded assignments to "targets"
  ARM: decompressor: drop more unneeded assignments to "targets"
  ARM: decompressor: use clean-files instead of extra-y to clean files
  ARM: decompressor: drop redundant FORCE in Makefile
  ARM: decompressor: merge piggy.*.S and simplify Makefile
  ARM: decompressor: rename suffix_y to compress-y

 arch/arm/boot/compressed/.gitignore                |  6 +----
 arch/arm/boot/compressed/Makefile                  | 31 ++++++++++------------
 arch/arm/boot/compressed/{piggy.gzip.S => piggy.S} |  2 +-
 arch/arm/boot/compressed/piggy.lz4.S               |  6 -----
 arch/arm/boot/compressed/piggy.lzma.S              |  6 -----
 arch/arm/boot/compressed/piggy.lzo.S               |  6 -----
 arch/arm/boot/compressed/piggy.xzkern.S            |  6 -----
 7 files changed, 16 insertions(+), 47 deletions(-)
 rename arch/arm/boot/compressed/{piggy.gzip.S => piggy.S} (67%)
 delete mode 100644 arch/arm/boot/compressed/piggy.lz4.S
 delete mode 100644 arch/arm/boot/compressed/piggy.lzma.S
 delete mode 100644 arch/arm/boot/compressed/piggy.lzo.S
 delete mode 100644 arch/arm/boot/compressed/piggy.xzkern.S

-- 
1.9.1

[toc] | [next] | [standalone]

#1339170 — [PATCH 5/6] ARM: decompressor: merge piggy.*.S and simplify Makefile

FromMasahiro Yamada <yamada.masahiro@socionext.com>
Date2016-02-22 08:40 +0100
Subject[PATCH 5/6] ARM: decompressor: merge piggy.*.S and simplify Makefile
Message-ID<r4Tg6-2j1-23@gated-at.bofh.it>
In reply to#1339169
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>
---

 arch/arm/boot/compressed/.gitignore                |  6 +-----
 arch/arm/boot/compressed/Makefile                  | 14 ++++++--------
 arch/arm/boot/compressed/{piggy.gzip.S => piggy.S} |  2 +-
 arch/arm/boot/compressed/piggy.lz4.S               |  6 ------
 arch/arm/boot/compressed/piggy.lzma.S              |  6 ------
 arch/arm/boot/compressed/piggy.lzo.S               |  6 ------
 arch/arm/boot/compressed/piggy.xzkern.S            |  6 ------
 7 files changed, 8 insertions(+), 38 deletions(-)
 rename arch/arm/boot/compressed/{piggy.gzip.S => piggy.S} (67%)
 delete mode 100644 arch/arm/boot/compressed/piggy.lz4.S
 delete mode 100644 arch/arm/boot/compressed/piggy.lzma.S
 delete mode 100644 arch/arm/boot/compressed/piggy.lzo.S
 delete mode 100644 arch/arm/boot/compressed/piggy.xzkern.S

diff --git a/arch/arm/boot/compressed/.gitignore b/arch/arm/boot/compressed/.gitignore
index 0714e03..86b2f5d 100644
--- a/arch/arm/boot/compressed/.gitignore
+++ b/arch/arm/boot/compressed/.gitignore
@@ -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
 
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 903b953..3243f09 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -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
 
@@ -177,17 +175,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=
 
diff --git a/arch/arm/boot/compressed/piggy.gzip.S b/arch/arm/boot/compressed/piggy.S
similarity index 67%
rename from arch/arm/boot/compressed/piggy.gzip.S
rename to arch/arm/boot/compressed/piggy.S
index a68adf9..f720884 100644
--- a/arch/arm/boot/compressed/piggy.gzip.S
+++ b/arch/arm/boot/compressed/piggy.S
@@ -1,6 +1,6 @@
 	.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:
diff --git a/arch/arm/boot/compressed/piggy.lz4.S b/arch/arm/boot/compressed/piggy.lz4.S
deleted file mode 100644
index 3d9a575..0000000
--- a/arch/arm/boot/compressed/piggy.lz4.S
+++ /dev/null
@@ -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:
diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S
deleted file mode 100644
index d7e69cf..0000000
--- a/arch/arm/boot/compressed/piggy.lzma.S
+++ /dev/null
@@ -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:
diff --git a/arch/arm/boot/compressed/piggy.lzo.S b/arch/arm/boot/compressed/piggy.lzo.S
deleted file mode 100644
index a425ad9..0000000
--- a/arch/arm/boot/compressed/piggy.lzo.S
+++ /dev/null
@@ -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:
diff --git a/arch/arm/boot/compressed/piggy.xzkern.S b/arch/arm/boot/compressed/piggy.xzkern.S
deleted file mode 100644
index 5703f30..0000000
--- a/arch/arm/boot/compressed/piggy.xzkern.S
+++ /dev/null
@@ -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:
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1339404

FromRussell King - ARM Linux <linux@arm.linux.org.uk>
Date2016-02-22 12:40 +0100
Message-ID<r4X0m-58j-25@gated-at.bofh.it>
In reply to#1339169
On Mon, Feb 22, 2016 at 04:31:11PM +0900, Masahiro Yamada wrote:
> Masahiro Yamada (6):
>   ARM: decompressor: drop unneeded assignments to "targets"
>   ARM: decompressor: drop more unneeded assignments to "targets"
>   ARM: decompressor: use clean-files instead of extra-y to clean files
>   ARM: decompressor: drop redundant FORCE in Makefile
>   ARM: decompressor: merge piggy.*.S and simplify Makefile
>   ARM: decompressor: rename suffix_y to compress-y

Most of this looks fine to me, but I've a question about how thoroughly
patch 5 has been tested: iow, do we get correct behaviour if only the
compression method is changed?

Thanks.

-- 
RMK's Patch system: http://www.arm.linux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.

[toc] | [prev] | [next] | [standalone]

#1339434

FromMasahiro Yamada <yamada.masahiro@socionext.com>
Date2016-02-22 13:10 +0100
Message-ID<r4Xtp-5Eo-25@gated-at.bofh.it>
In reply to#1339404
Hi Russell,


2016-02-22 20:36 GMT+09:00 Russell King - ARM Linux <linux@arm.linux.org.uk>:
> On Mon, Feb 22, 2016 at 04:31:11PM +0900, Masahiro Yamada wrote:
>> Masahiro Yamada (6):
>>   ARM: decompressor: drop unneeded assignments to "targets"
>>   ARM: decompressor: drop more unneeded assignments to "targets"
>>   ARM: decompressor: use clean-files instead of extra-y to clean files
>>   ARM: decompressor: drop redundant FORCE in Makefile
>>   ARM: decompressor: merge piggy.*.S and simplify Makefile
>>   ARM: decompressor: rename suffix_y to compress-y
>
> Most of this looks fine to me, but I've a question about how thoroughly
> patch 5 has been tested: iow, do we get correct behaviour if only the
> compression method is changed?
>
> Thanks.


I did build-test, changing the configuration
CONFIG_KERNEL_GZIP -> CONFIG_KERNEL_LZMA -> CONFIG_KERNEL_XZ -> ...

I confirmed zImage was created from the expected piggy.

For run-test, it worked fine too.



-- 
Best Regards
Masahiro Yamada

[toc] | [prev] | [next] | [standalone]

#1339437

FromRussell King - ARM Linux <linux@arm.linux.org.uk>
Date2016-02-22 13:20 +0100
Message-ID<r4XD4-5Jc-11@gated-at.bofh.it>
In reply to#1339434
On Mon, Feb 22, 2016 at 09:08:05PM +0900, Masahiro Yamada wrote:
> I did build-test, changing the configuration
> CONFIG_KERNEL_GZIP -> CONFIG_KERNEL_LZMA -> CONFIG_KERNEL_XZ -> ...
> 
> I confirmed zImage was created from the expected piggy.
> 
> For run-test, it worked fine too.

Okay, please drop them into the patch system, thanks.

-- 
RMK's Patch system: http://www.arm.linux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.

[toc] | [prev] | [next] | [standalone]

#1339447

FromMasahiro Yamada <yamada.masahiro@socionext.com>
Date2016-02-22 13:40 +0100
Message-ID<r4XWq-5Qy-11@gated-at.bofh.it>
In reply to#1339437
Hi Russell,

2016-02-22 21:18 GMT+09:00 Russell King - ARM Linux <linux@arm.linux.org.uk>:
> On Mon, Feb 22, 2016 at 09:08:05PM +0900, Masahiro Yamada wrote:
>> I did build-test, changing the configuration
>> CONFIG_KERNEL_GZIP -> CONFIG_KERNEL_LZMA -> CONFIG_KERNEL_XZ -> ...
>>
>> I confirmed zImage was created from the expected piggy.
>>
>> For run-test, it worked fine too.
>
> Okay, please drop them into the patch system, thanks.

I did so.  Thanks.



-- 
Best Regards
Masahiro Yamada

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web