[PATCH,resend] sparc64: build compressed image (zImage) by default

[PATCH,resend] sparc64: build compressed image (zImage) by default

[Frans Pop]

From: Jurij Smakov <jurij@wooyd.org>
Subject: sparc64: build compressed image (zImage) by default

Besides creating the uncompressed vmlinux image for sparc64, also
create a compressed zImage. This is more consistent with other
architectures and required to make the 'deb-pkg' target work.

Signed-off-by: Jurij Smakov <jurij@wooyd.org>
Signed-off-by: Frans Pop <elendil@planet.nl>

---
The patch was taken from the Debian kernel package. It was written by
Jurij. I added his Signed-off-by with his permission.

The patch was tested to work during my recent tests for the cmd64x issue.

diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index 2003ded..2adc5ea 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -91,6 +91,9 @@ endif
 
 boot := arch/sparc/boot
 
+# Default target
+all: zImage
+
 image zImage tftpboot.img vmlinux.aout: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile
index 1ff0fd9..97e3feb 100644
--- a/arch/sparc/boot/Makefile
+++ b/arch/sparc/boot/Makefile
@@ -79,6 +79,9 @@ $(obj)/image: vmlinux FORCE
 	$(call if_changed,strip)
 	@echo '  kernel: $@ is ready'
 
+$(obj)/zImage: $(obj)/image
+	$(call if_changed,gzip)
+
 $(obj)/tftpboot.img: $(obj)/image $(obj)/piggyback_64 System.map $(ROOT_IMG) FORCE
 	$(call if_changed,elftoaout)
 	$(call if_changed,piggy)

[PATCH,resend] sparc64: build compressed image (zImage) by default

[Frans Pop]

From: Jurij Smakov <jurij@wooyd.org>
Subject: sparc64: build compressed image (zImage) by default

Besides creating the uncompressed vmlinux image for sparc64, also
create a compressed zImage. This is more consistent with other
architectures and required to make the 'deb-pkg' target work.

Signed-off-by: Jurij Smakov <jurij@wooyd.org>
Signed-off-by: Frans Pop <elendil@planet.nl>

---
The patch was taken from the Debian kernel package. It was written by
Jurij. I added his Signed-off-by with his permission.

The patch was tested to work during my recent tests for the cmd64x issue.

diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index 2003ded..2adc5ea 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -91,6 +91,9 @@ endif
 
 boot := arch/sparc/boot
 
+# Default target
+all: zImage
+
 image zImage tftpboot.img vmlinux.aout: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile
index 1ff0fd9..97e3feb 100644
--- a/arch/sparc/boot/Makefile
+++ b/arch/sparc/boot/Makefile
@@ -79,6 +79,9 @@ $(obj)/image: vmlinux FORCE
 	$(call if_changed,strip)
 	@echo '  kernel: $@ is ready'
 
+$(obj)/zImage: $(obj)/image
+	$(call if_changed,gzip)
+
 $(obj)/tftpboot.img: $(obj)/image $(obj)/piggyback_64 System.map $(ROOT_IMG) FORCE
 	$(call if_changed,elftoaout)
 	$(call if_changed,piggy)

Re: [PATCH,resend] sparc64: build compressed image (zImage) by default

[Sam Ravnborg]

On Thu, Jul 16, 2009 at 08:41:52PM +0200, Frans Pop wrote:
> From: Jurij Smakov <jurij@wooyd.org>
> Subject: sparc64: build compressed image (zImage) by default
> 
> Besides creating the uncompressed vmlinux image for sparc64, also
> create a compressed zImage. This is more consistent with other
> architectures and required to make the 'deb-pkg' target work.
> 
> Signed-off-by: Jurij Smakov <jurij@wooyd.org>
> Signed-off-by: Frans Pop <elendil@planet.nl>
> 
> ---
> The patch was taken from the Debian kernel package. It was written by
> Jurij. I added his Signed-off-by with his permission.
> 
> The patch was tested to work during my recent tests for the cmd64x issue.

Hmmm..
This path does the following:
1) zImage becomes default for sparc and sparc64
2) fixes zImage on sparc64 (it dod not work before)
3) On sparc zImage is a stripped version of vmlinux, on sparc64 it is a gzipped not-stripped
   version of vmlinux - so it introduces a significantly different zImage.

Could we agree on the _same_ format for zImage on sparc and sparc64 and then apply that patch?

I know Julian is working on unifying piggyback_{32,64}.c so maybe that is
covered by his work?

If we fix it so zImage is the same thing on sparc and sparc64 this could go in before
we see the unification of piggyback.
For deb-pkg to work we could just let the sparc64 version be a stripped version - no?
Then you would have covered my main complaint about this patch.

	Sam

Re: [PATCH,resend] sparc64: build compressed image (zImage) by

[Sam Ravnborg]

On Thu, Jul 16, 2009 at 08:41:52PM +0200, Frans Pop wrote:
> From: Jurij Smakov <jurij@wooyd.org>
> Subject: sparc64: build compressed image (zImage) by default
> 
> Besides creating the uncompressed vmlinux image for sparc64, also
> create a compressed zImage. This is more consistent with other
> architectures and required to make the 'deb-pkg' target work.
> 
> Signed-off-by: Jurij Smakov <jurij@wooyd.org>
> Signed-off-by: Frans Pop <elendil@planet.nl>
> 
> ---
> The patch was taken from the Debian kernel package. It was written by
> Jurij. I added his Signed-off-by with his permission.
> 
> The patch was tested to work during my recent tests for the cmd64x issue.

Hmmm..
This path does the following:
1) zImage becomes default for sparc and sparc64
2) fixes zImage on sparc64 (it dod not work before)
3) On sparc zImage is a stripped version of vmlinux, on sparc64 it is a gzipped not-stripped
   version of vmlinux - so it introduces a significantly different zImage.

Could we agree on the _same_ format for zImage on sparc and sparc64 and then apply that patch?

I know Julian is working on unifying piggyback_{32,64}.c so maybe that is
covered by his work?

If we fix it so zImage is the same thing on sparc and sparc64 this could go in before
we see the unification of piggyback.
For deb-pkg to work we could just let the sparc64 version be a stripped version - no?
Then you would have covered my main complaint about this patch.

	Sam

Re: [PATCH,resend] sparc64: build compressed image (zImage) by default

[David Miller]

It's in my queue you don't need to resend this:

http://patchwork.ozlabs.org/patch/29268/

Re: [PATCH,resend] sparc64: build compressed image (zImage) by

[David Miller]

It's in my queue you don't need to resend this:

http://patchwork.ozlabs.org/patch/29268/

Re: [PATCH,resend] sparc64: build compressed image (zImage) by default

[Frans Pop]

On Thursday 16 July 2009, David Miller wrote:
> It's in my queue you don't need to resend this:
>
> http://patchwork.ozlabs.org/patch/29268/

OK, thanks. I did not see any ack on my mail so I was not aware you'd 
already picked it up.

Re: [PATCH,resend] sparc64: build compressed image (zImage) by default

[Frans Pop]

On Thursday 16 July 2009, David Miller wrote:
> It's in my queue you don't need to resend this:
>
> http://patchwork.ozlabs.org/patch/29268/

OK, thanks. I did not see any ack on my mail so I was not aware you'd 
already picked it up.

Re: [PATCH,resend] sparc64: build compressed image (zImage) by default

[Julian Calaby]

On Fri, Jul 17, 2009 at 06:16, Sam Ravnborg<sam@ravnborg.org> wrote:
> Hmmm..
> This path does the following:
> 1) zImage becomes default for sparc and sparc64
> 2) fixes zImage on sparc64 (it dod not work before)
> 3) On sparc zImage is a stripped version of vmlinux, on sparc64 it is a gzipped not-stripped
>   version of vmlinux - so it introduces a significantly different zImage.
>
> Could we agree on the _same_ format for zImage on sparc and sparc64 and then apply that patch?
>
> I know Julian is working on unifying piggyback_{32,64}.c so maybe that is
> covered by his work?

I have been fiddling with that, but time is been at a premium at the moment.

I don't believe that changes to the zImage / vmlinux targets will
affect this as the tftpboot code uses the uncompressed (I believe)
"Image" target.

Thanks,

-- 

Julian Calaby

Email: julian.calaby@gmail.com
.Plan: http://sites.google.com/site/juliancalaby/

Re: [PATCH,resend] sparc64: build compressed image (zImage) by

[Julian Calaby]

On Fri, Jul 17, 2009 at 06:16, Sam Ravnborg<sam@ravnborg.org> wrote:
> Hmmm..
> This path does the following:
> 1) zImage becomes default for sparc and sparc64
> 2) fixes zImage on sparc64 (it dod not work before)
> 3) On sparc zImage is a stripped version of vmlinux, on sparc64 it is a gzipped not-stripped
>   version of vmlinux - so it introduces a significantly different zImage.
>
> Could we agree on the _same_ format for zImage on sparc and sparc64 and then apply that patch?
>
> I know Julian is working on unifying piggyback_{32,64}.c so maybe that is
> covered by his work?

I have been fiddling with that, but time is been at a premium at the moment.

I don't believe that changes to the zImage / vmlinux targets will
affect this as the tftpboot code uses the uncompressed (I believe)
"Image" target.

Thanks,

-- 

Julian Calaby

Email: julian.calaby@gmail.com
.Plan: http://sites.google.com/site/juliancalaby/

Re: [PATCH,resend] sparc64: build compressed image (zImage) by default

[Frans Pop]

On Thursday 16 July 2009, Sam Ravnborg wrote:
> On Thu, Jul 16, 2009 at 08:41:52PM +0200, Frans Pop wrote:
> > From: Jurij Smakov <jurij@wooyd.org>
> > Subject: sparc64: build compressed image (zImage) by default
> >
> > Besides creating the uncompressed vmlinux image for sparc64, also
> > create a compressed zImage. This is more consistent with other
> > architectures and required to make the 'deb-pkg' target work.
> >
> > Signed-off-by: Jurij Smakov <jurij@wooyd.org>
> > Signed-off-by: Frans Pop <elendil@planet.nl>
>
> Hmmm..
> This path does the following:
> 1) zImage becomes default for sparc and sparc64
> 2) fixes zImage on sparc64 (it dod not work before)
> 3) On sparc zImage is a stripped version of vmlinux, on sparc64 it is a
> gzipped not-stripped version of vmlinux - so it introduces a
> significantly different zImage.

If I read arch/sparc/boot/Makefile correctly then the sparc64 image _is_ 
stripped as the zImage target calls $(obj)/image which does the strip.
So the difference is less than you suggest.

> Could we agree on the _same_ format for zImage on sparc and sparc64 and
> then apply that patch?

I vaguely recall from Debian work that loading compressed kernels caused 
problems on sparc32 hardware (due to insufficient memory?), which could 
justify the difference. But I may be wrong.

Cheers,
FJP

Re: [PATCH,resend] sparc64: build compressed image (zImage) by default

[Frans Pop]

On Thursday 16 July 2009, Sam Ravnborg wrote:
> On Thu, Jul 16, 2009 at 08:41:52PM +0200, Frans Pop wrote:
> > From: Jurij Smakov <jurij@wooyd.org>
> > Subject: sparc64: build compressed image (zImage) by default
> >
> > Besides creating the uncompressed vmlinux image for sparc64, also
> > create a compressed zImage. This is more consistent with other
> > architectures and required to make the 'deb-pkg' target work.
> >
> > Signed-off-by: Jurij Smakov <jurij@wooyd.org>
> > Signed-off-by: Frans Pop <elendil@planet.nl>
>
> Hmmm..
> This path does the following:
> 1) zImage becomes default for sparc and sparc64
> 2) fixes zImage on sparc64 (it dod not work before)
> 3) On sparc zImage is a stripped version of vmlinux, on sparc64 it is a
> gzipped not-stripped version of vmlinux - so it introduces a
> significantly different zImage.

If I read arch/sparc/boot/Makefile correctly then the sparc64 image _is_ 
stripped as the zImage target calls $(obj)/image which does the strip.
So the difference is less than you suggest.

> Could we agree on the _same_ format for zImage on sparc and sparc64 and
> then apply that patch?

I vaguely recall from Debian work that loading compressed kernels caused 
problems on sparc32 hardware (due to insufficient memory?), which could 
justify the difference. But I may be wrong.

Cheers,
FJP

Re: [PATCH,resend] sparc64: build compressed image (zImage) by default

[David Miller]

From: Frans Pop <elendil@planet.nl>
Date: Wed, 22 Jul 2009 19:07:39 +0200

> I vaguely recall from Debian work that loading compressed kernels caused 
> problems on sparc32 hardware (due to insufficient memory?), which could 
> justify the difference. But I may be wrong.

This is, unfortunately, very likely true.

Re: [PATCH,resend] sparc64: build compressed image (zImage) by

[David Miller]

From: Frans Pop <elendil@planet.nl>
Date: Wed, 22 Jul 2009 19:07:39 +0200

> I vaguely recall from Debian work that loading compressed kernels caused 
> problems on sparc32 hardware (due to insufficient memory?), which could 
> justify the difference. But I may be wrong.

This is, unfortunately, very likely true.

[PATCH] sparc64: list zImage build target in 'make help' output

[Frans Pop]

The zImage target was added and gets built by default.

Signed-off-by: Frans Pop <elendil@planet.nl>
Cc: Jurij Smakov <jurij@wooyd.org>
---

While looking at Sam Ravnborg's comments I noticed that the following
should be added on top of Jurij's patch.

David: if you prefer to merge this into the previous patch, that'd be
fine by me.

diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index 2adc5ea..b588880 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -112,8 +112,9 @@ define archhelp
 endef
 else
 define archhelp
-  echo  '* vmlinux       - Standard sparc64 kernel'
-  echo  '  vmlinux.aout  - a.out kernel for sparc64'
+  echo  '* vmlinux      - standard sparc64 kernel'
+  echo  '* zImage       - stripped and compressed sparc64 kernel ($(boot)/zImage)'
+  echo  '  vmlinux.aout - a.out kernel for sparc64'
   echo  '  tftpboot.img - image prepared for tftp'
 endef
 endif

[PATCH] sparc64: list zImage build target in 'make help' output

[Frans Pop]

The zImage target was added and gets built by default.

Signed-off-by: Frans Pop <elendil@planet.nl>
Cc: Jurij Smakov <jurij@wooyd.org>
---

While looking at Sam Ravnborg's comments I noticed that the following
should be added on top of Jurij's patch.

David: if you prefer to merge this into the previous patch, that'd be
fine by me.

diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index 2adc5ea..b588880 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -112,8 +112,9 @@ define archhelp
 endef
 else
 define archhelp
-  echo  '* vmlinux       - Standard sparc64 kernel'
-  echo  '  vmlinux.aout  - a.out kernel for sparc64'
+  echo  '* vmlinux      - standard sparc64 kernel'
+  echo  '* zImage       - stripped and compressed sparc64 kernel ($(boot)/zImage)'
+  echo  '  vmlinux.aout - a.out kernel for sparc64'
   echo  '  tftpboot.img - image prepared for tftp'
 endef
 endif

Re: [PATCH] sparc64: list zImage build target in 'make help' output

[David Miller]

From: Frans Pop <elendil@planet.nl>
Date: Thu, 23 Jul 2009 20:55:18 +0200

> The zImage target was added and gets built by default.
> 
> Signed-off-by: Frans Pop <elendil@planet.nl>
> Cc: Jurij Smakov <jurij@wooyd.org>
> ---
> 
> While looking at Sam Ravnborg's comments I noticed that the following
> should be added on top of Jurij's patch.
> 
> David: if you prefer to merge this into the previous patch, that'd be
> fine by me.

I merged it into the sparc64 zImage patch, thanks!

Re: [PATCH] sparc64: list zImage build target in 'make help' output

[David Miller]

From: Frans Pop <elendil@planet.nl>
Date: Thu, 23 Jul 2009 20:55:18 +0200

> The zImage target was added and gets built by default.
> 
> Signed-off-by: Frans Pop <elendil@planet.nl>
> Cc: Jurij Smakov <jurij@wooyd.org>
> ---
> 
> While looking at Sam Ravnborg's comments I noticed that the following
> should be added on top of Jurij's patch.
> 
> David: if you prefer to merge this into the previous patch, that'd be
> fine by me.

I merged it into the sparc64 zImage patch, thanks!