[PATCH] Build a uImage with dtb already appended

[PATCH] Build a uImage with dtb already appended

[Grant Likely]

Do not commit to mainline; this is a useful hack only for now.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
 arch/arm/Makefile      |    3 +++
 arch/arm/boot/Makefile |    8 ++++++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 70c424e..0677b86 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -282,6 +282,9 @@ zImage Image xipImage bootpImage uImage: vmlinux
 zinstall uinstall install: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
+uImage-dtb.%:
+	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
+
 %.dtb:
 	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
 
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index a1edfd5..a64493b 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -57,6 +57,9 @@ $(obj)/zImage:	$(obj)/compressed/vmlinux FORCE
 	$(call if_changed,objcopy)
 	@echo '  Kernel: $@ is ready'
 
+$(obj)/zImage-dtb.%:	$(obj)/%.dtb $(obj)/zImage
+	cat $(obj)/zImage $< > $@
+
 endif
 
 # Rule to build device tree blobs
@@ -77,11 +80,16 @@ $(obj)/uImage: LOADADDR=$(ZRELADDR)
 endif
 
 $(obj)/uImage: STARTADDR=$(LOADADDR)
+$(obj)/uImage-dtb.%: STARTADDR=$(LOADADDR)
 
 $(obj)/uImage:	$(obj)/zImage FORCE
 	$(call if_changed,uimage)
 	@echo '  Image $@ is ready'
 
+$(obj)/uImage-dtb.%:	$(obj)/zImage-dtb.% FORCE
+	$(call if_changed,uimage)
+	@echo '  Image $@ is ready'
+
 $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
 	$(Q)$(MAKE) $(build)=$(obj)/bootp $@
 	@:

[PATCH] fix for: Build a uImage with dtb already appended

[Nicolas Ferre]

---
 arch/arm/boot/Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index a64493b..68d6f23 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -75,8 +75,10 @@ quiet_cmd_uimage = UIMAGE  $@
 
 ifeq ($(CONFIG_ZBOOT_ROM),y)
 $(obj)/uImage: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT)
+$(obj)/uImage-dtb.%: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT)
 else
 $(obj)/uImage: LOADADDR=$(ZRELADDR)
+$(obj)/uImage-dtb.%: LOADADDR=$(ZRELADDR)
 endif
 
 $(obj)/uImage: STARTADDR=$(LOADADDR)
-- 
1.7.4.1

[PATCH v2] Build a zImage or uImage with dtb already appended

[Domenico Andreoli]

From: Domenico Andreoli <domenico.andreoli@linux.com>

Add new targets to build zImage and uImage with DTB appended (i.e. make
'uImage-dtb.am335x-bone' or 'make zImage-dtb.omap3-evm').

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Domenico Andreoli <domenico.andreoli@linux.com>

---

On Tue, Aug 02, 2011 at 03:31:48PM +0100, Grant Likely wrote:
> Do not commit to mainline; this is a useful hack only for now.
> 

Is this a better moment for this patch?

Anyway, here is an update for v3.5-rc4. Added zImage-dtb.* as a valid
target and the .gitignore entries.

cheers
Domenico

---
 arch/arm/Makefile        |    6 ++++++
 arch/arm/boot/.gitignore |    2 ++
 arch/arm/boot/Makefile   |    7 +++++++
 3 files changed, 15 insertions(+)

Index: b/arch/arm/Makefile
===================================================================
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -283,6 +283,12 @@ zImage Image xipImage bootpImage uImage:
 zinstall uinstall install: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
+zImage-dtb.%:
+	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
+
+uImage-dtb.%:
+	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
+
 %.dtb:
 	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
 
Index: b/arch/arm/boot/Makefile
===================================================================
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -55,6 +55,9 @@ $(obj)/zImage:	$(obj)/compressed/vmlinux
 	$(call if_changed,objcopy)
 	@echo '  Kernel: $@ is ready'
 
+$(obj)/zImage-dtb.%:	$(obj)/%.dtb $(obj)/zImage
+	cat $(obj)/zImage $< > $@
+
 endif
 
 targets += $(dtb-y)
@@ -90,6 +93,10 @@ $(obj)/uImage:	$(obj)/zImage FORCE
 	$(call if_changed,uimage)
 	@echo '  Image $@ is ready'
 
+$(obj)/uImage-dtb.%:	$(obj)/zImage-dtb.% FORCE
+	$(call if_changed,uimage)
+	@echo '  Image $@ is ready'
+
 $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
 	$(Q)$(MAKE) $(build)=$(obj)/bootp $@
 	@:
Index: b/arch/arm/boot/.gitignore
===================================================================
--- a/arch/arm/boot/.gitignore
+++ b/arch/arm/boot/.gitignore
@@ -1,6 +1,8 @@
 Image
 zImage
+zImage-dtb.*
 xipImage
 bootpImage
 uImage
+uImage-dtb.*
 *.dtb

[PATCH] Build a uImage with dtb already appended

[Christoph Junghans]

Add new targets to build zImage and uImage with DTB appended (i.e. make
'uImage-dtb.am335x-bone' or 'make zImage-dtb.omap3-evm').

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Domenico Andreoli <domenico.andreoli@linux.com>
Signed-off-by: Christoph Junghans <ottxor@gentoo.org>
---

I don't know why this never got merged, but I think it is still useful.

V1: by Grant Likely (02 Aug 2011)
V2: by Domenico Andreoli (29 Jun 2012)
    added .gitignore change
V3: added archhelp

 arch/arm/Makefile        | 5 +++++
 arch/arm/boot/.gitignore | 2 ++
 arch/arm/boot/Makefile   | 8 ++++++++
 3 files changed, 15 insertions(+)

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index c1785ee..b3d51e24 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -308,6 +308,9 @@ $(BOOT_TARGETS): vmlinux
 $(INSTALL_TARGETS):
 	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
+uImage-dtb.%: vmlinux
+	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
+
 %.dtb: | scripts
 	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
 
@@ -330,9 +333,11 @@ i zi:;	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
 define archhelp
   echo  '* zImage        - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
+  echo  '  zImage-dtb.*  - zImage' with appended dtb blob for machine=*
   echo  '  Image         - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'
   echo  '* xipImage      - XIP kernel image, if configured (arch/$(ARCH)/boot/xipImage)'
   echo  '  uImage        - U-Boot wrapped zImage'
+  echo  '  uImage-dtb.*  - U-Boot wrapped zImage' with appended dtb blob for machine=*
   echo  '  bootpImage    - Combined zImage and initial RAM disk'
   echo  '                  (supply initrd image via make variable INITRD=<path>)'
   echo  '* dtbs          - Build device tree blobs for enabled boards'
diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore
index 3c79f85..3d7e1c8 100644
--- a/arch/arm/boot/.gitignore
+++ b/arch/arm/boot/.gitignore
@@ -1,6 +1,8 @@
 Image
 zImage
+zImage-dtb.*
 xipImage
 bootpImage
 uImage
+uImage-dtb.*
 *.dtb
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index ec2f806..6bc21d2 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -55,6 +55,9 @@ $(obj)/zImage:	$(obj)/compressed/vmlinux FORCE
 	$(call if_changed,objcopy)
 	@$(kecho) '  Kernel: $@ is ready'
 
+$(obj)/zImage-dtb.%:	$(obj)/dts/%.dtb $(obj)/zImage
+	cat $(obj)/zImage $< > $@
+
 endif
 
 ifneq ($(LOADADDR),)
@@ -80,6 +83,11 @@ $(obj)/uImage:	$(obj)/zImage FORCE
 	$(call if_changed,uimage)
 	@$(kecho) '  Image $@ is ready'
 
+$(obj)/uImage-dtb.%:	$(obj)/zImage-dtb.% FORCE
+	@$(check_for_multiple_loadaddr)
+	$(call if_changed,uimage)
+	@echo '  Image $@ is ready'
+
 $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
 	$(Q)$(MAKE) $(build)=$(obj)/bootp $@
 	@:
-- 
2.0.5

[PATCH] Build a uImage with dtb already appended

[Olof Johansson]

On Wed, Jan 14, 2015 at 6:08 PM, Christoph Junghans <ottxor@gentoo.org> wrote:
> Add new targets to build zImage and uImage with DTB appended (i.e. make
> 'uImage-dtb.am335x-bone' or 'make zImage-dtb.omap3-evm').
>
> Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
> Signed-off-by: Domenico Andreoli <domenico.andreoli@linux.com>
> Signed-off-by: Christoph Junghans <ottxor@gentoo.org>
> ---
>
> I don't know why this never got merged, but I think it is still useful.

Maybe the patch description on the first version of the patch is a hint?

https://lkml.org/lkml/2011/8/2/200

In general, we're moving away from generating custom images straight
out of the kernel build system. You should make that part of your
installation scripts or similar instead.


-Olof

[PATCH] Build a uImage with dtb already appended

[Willy Tarreau]

Hi Olof,

On Wed, Jan 14, 2015 at 06:31:48PM -0800, Olof Johansson wrote:
> On Wed, Jan 14, 2015 at 6:08 PM, Christoph Junghans <ottxor@gentoo.org> wrote:
> > Add new targets to build zImage and uImage with DTB appended (i.e. make
> > 'uImage-dtb.am335x-bone' or 'make zImage-dtb.omap3-evm').
> >
> > Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
> > Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
> > Signed-off-by: Domenico Andreoli <domenico.andreoli@linux.com>
> > Signed-off-by: Christoph Junghans <ottxor@gentoo.org>
> > ---
> >
> > I don't know why this never got merged, but I think it is still useful.
> 
> Maybe the patch description on the first version of the patch is a hint?
> 
> https://lkml.org/lkml/2011/8/2/200
> 
> In general, we're moving away from generating custom images straight
> out of the kernel build system. You should make that part of your
> installation scripts or similar instead.

FWIW, I *do* find this useful. My build scripts have to differ between
x86 and ARM only because of dtb. I would love to see this patch merged,
and anyway I'll add it to my own tree because it will simplify my build
process.

Thanks,
Willy

[PATCH] Build a uImage with dtb already appended

[Russell King - ARM Linux]

On Wed, Jan 14, 2015 at 07:08:13PM -0700, Christoph Junghans wrote:
> Add new targets to build zImage and uImage with DTB appended (i.e. make
> 'uImage-dtb.am335x-bone' or 'make zImage-dtb.omap3-evm').
> 
> Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
> Signed-off-by: Domenico Andreoli <domenico.andreoli@linux.com>
> Signed-off-by: Christoph Junghans <ottxor@gentoo.org>
> ---
> 
> I don't know why this never got merged, but I think it is still useful.

What do you do about supplying the load address argument to mkimage,
which is highly platform specific?

This may be useful if you want to create one uImage for one platform,
but it's not useful in other cases.

However, in general, I don't want to augment the u-boot crap that we
already have in the kernel; it's too inflexible.  You're much better
off taking the zImage and DTB, combining them yourself, and then
_if_ you insist on using the u-boot legacy format, running mkimage.

The alternative is to move forward with your uboot skills, and see
whether your uboot supports loading the fdt and use bootz with the
zImage instead of bootm.

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.