Build a uImage with dtb already appended
PATCH 1/1 Build a uImage with dtb already appended
Do not commit to mainline; this is a useful hack only for now.
--- arch/arm/Makefile | 3 +++ arch/arm/boot/Makefile | 8 ++++++++ 2 files changed, 11 insertions(+), 0 deletions(-)
arch/arm/Makefile +3 -0
@@ -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)/$@
arch/arm/boot/Makefile +8 -0
@@ -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 1/1 fix for: Build a uImage with dtb already appended
--- arch/arm/boot/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/boot/Makefile +2 -0
@@ -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)
Signature · 1 line
1.7.4.1
PATCH v2 1/1 Build a zImage or uImage with dtb already appended
In reply to Grant LikelyFrom: Domenico Andreoli <[email protected]>
Add new targets to build zImage and uImage with DTB appended (i.e. make 'uImage-dtb.am335x-bone' or 'make zImage-dtb.omap3-evm').
---
Quoted 2 lines · Grant Likely
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(+)
arch/arm/Makefile +6 -0
@@ -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)/$@
arch/arm/boot/Makefile +7 -0
@@ -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 $@ @:
arch/arm/boot/.gitignore +2 -0
@@ -1,6 +1,8 @@ Image zImage +zImage-dtb.* xipImage bootpImage uImage +uImage-dtb.* *.dtb
PATCH 1/1 Build a uImage with dtb already appended
In reply to Grant LikelyAdd new targets to build zImage and uImage with DTB appended (i.e. make 'uImage-dtb.am335x-bone' or 'make zImage-dtb.omap3-evm').
---
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(+)
arch/arm/Makefile +5 -0
@@ -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'
arch/arm/boot/.gitignore +2 -0
@@ -1,6 +1,8 @@ Image zImage +zImage-dtb.* xipImage bootpImage uImage +uImage-dtb.* *.dtb
arch/arm/boot/Makefile +8 -0
@@ -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 $@ @:
Signature · 1 line
2.0.5
PATCH 1/1 Build a uImage with dtb already appended
Quoted 10 lines · 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 <[email protected]>Signed-off-by Grant Likely <[email protected]>Signed-off-by Domenico Andreoli <[email protected]>Signed-off-by Christoph Junghans <[email protected]>---
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 1/1 Build a uImage with dtb already appended
Hi Olof,
Quoted 12 lines · Olof Johansson
Quoted 10 lines · 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 <[email protected]>Signed-off-by Grant Likely <[email protected]>Signed-off-by Domenico Andreoli <[email protected]>Signed-off-by Christoph Junghans <[email protected]>---
I don't know why this never got merged, but I think it is still useful.
Quoted 7 lines
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 1/1 Build a uImage with dtb already appended
In reply to Christoph JunghansQuoted 10 lines · 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 <[email protected]>Signed-off-by Grant Likely <[email protected]>Signed-off-by Domenico Andreoli <[email protected]>Signed-off-by Christoph Junghans <[email protected]>---
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.
Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up according to speedtest.net.