Skip to contentSkip to conversation

uImage with integrated dtb file

PATCH Roland Stigge 4 participants 5 messages Mar 24, 2012 – Mar 26, 2012 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

Hi,

since I will need to maintain some machines with DT enabled kernels but containing a U-Boot without DT support, I sometimes need to integrate a dtb file into uImage.

I'm sure others have got the same issue. But searching for a while I only got older/meanwhile neglected approaches like:

git://kernel.ubuntu.com/jk/dt/linux-2.6.git - branch: dtbimage

I'm currently using a simple hack like attached below.

Wondering what others are doing.

Sorry if this topic has already been discussed.

Roland

arch/arm/boot/Makefile +4 -2
@@ -70,9 +70,11 @@ $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))
 clean-files := *.dtb
 
 quiet_cmd_uimage = UIMAGE  $@
-      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \
+      cmd_uimage = cat $< arch/arm/boot/*.dtb > $<.tmp ; \
+                  $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \
                   -C none -a $(LOADADDR) -e $(STARTADDR) \
-                  -n 'Linux-$(KERNELRELEASE)' -d $< $@
+                  -n 'Linux-$(KERNELRELEASE)' -d $<.tmp $@ ; \
+                  rm -f $<.tmp
 
 ifeq ($(CONFIG_ZBOOT_ROM),y)
 $(obj)/uImage: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT)
#1 lore raw
Quoted 10 lines · Roland Stigge

Hi,

since I will need to maintain some machines with DT enabled kernels but containing a U-Boot without DT support, I sometimes need to integrate a dtb file into uImage.

I'm sure others have got the same issue. But searching for a while I only got older/meanwhile neglected approaches like:

git://kernel.ubuntu.com/jk/dt/linux-2.6.git - branch: dtbimage

Would have been nice if you would have provided a http link ;)

Quoted 3 lines

I'm currently using a simple hack like attached below.

Wondering what others are doing.

In the past I saw people using something like

http://lists.infradead.org/pipermail/linux-arm-kernel/2011-September/064353.html

I'm not sure if the is the most recent version, though.

Best regards

Dirk

Quoted 27 lines

Sorry if this topic has already been discussed.

Roland

arch/arm/boot/Makefile +4 -2
@@ -70,9 +70,11 @@ $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))
  clean-files := *.dtb
 
  quiet_cmd_uimage = UIMAGE  $@
-      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \
+      cmd_uimage = cat $<  arch/arm/boot/*.dtb>  $<.tmp ; \
+                  $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \
                    -C none -a $(LOADADDR) -e $(STARTADDR) \
-                  -n 'Linux-$(KERNELRELEASE)' -d $<  $@
+                  -n 'Linux-$(KERNELRELEASE)' -d $<.tmp $@ ; \
+                  rm -f $<.tmp
 
  ifeq ($(CONFIG_ZBOOT_ROM),y)
  $(obj)/uImage: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT)

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#2 lore raw
In reply to Roland Stigge
Quoted 5 lines · Roland Stigge

Hi,

since I will need to maintain some machines with DT enabled kernels but containing a U-Boot without DT support, I sometimes need to integrate a dtb file into uImage.

I use the new image format that is itself based on FDT and has support for appending a DTB. Some documentation can be found here:

	http://git.denx.de/u-boot.git/?p=u-boot.git;a=tree;f=doc/uImage.FIT

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120325/02582b30/attachment.sig>

#3 lore raw
In reply to Roland Stigge
Quoted 12 lines · Roland Stigge

Hi,

since I will need to maintain some machines with DT enabled kernels but containing a U-Boot without DT support, I sometimes need to integrate a dtb file into uImage.

I'm sure others have got the same issue. But searching for a while I only got older/meanwhile neglected approaches like:

git://kernel.ubuntu.com/jk/dt/linux-2.6.git - branch: dtbimage

I'm currently using a simple hack like attached below.

...

Quoted 1 line

--- a/arch/arm/boot/Makefile

...

arch/arm/boot/Makefile $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y)) · line 73

Quoted 3 lines

quiet_cmd_uimage = UIMAGE $@

arch/arm/boot/Makefile +1 -1
-      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \
+      cmd_uimage = cat $< arch/arm/boot/*.dtb > $<.tmp ; \

That won't work well when multiple .dtb files are built. That's certainly common for Tegra, and probably most subarchs.

The concatenation should be optional; people not using CONFIG_APPENDED_DTB (hopefully the majority) wouldn't want this for example.

Please be aware of:

https://lkml.org/lkml/2012/3/16/450
Kbuild: centralize MKIMAGE and cmd_uimage definitions

I believe previous discussion around this topic has resolved into people not wanting to make CONFIG_APPENDED_DTB to easy to use, so that people who don't need to use it won't be tempted to just use it instead of explicit FDT support in bootloaders. For example, see:

https://lkml.org/lkml/2011/8/2/200
Build a uImage with dtb already appended

... which Grant has specifically stated he didn't want applied upstream for the reason I mention above.

Quoted 5 lines
arch/arm/boot/Makefile +3 -1
+                  $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \
                   -C none -a $(LOADADDR) -e $(STARTADDR) \
-                  -n 'Linux-$(KERNELRELEASE)' -d $< $@
+                  -n 'Linux-$(KERNELRELEASE)' -d $<.tmp $@ ; \
+                  rm -f $<.tmp
#4 lore raw
Quoted 5 lines · Stephen Warren

arch/arm/boot/Makefile $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y)) · line 73

Quoted 3 lines

quiet_cmd_uimage = UIMAGE $@

arch/arm/boot/Makefile +1 -1
-      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \
+      cmd_uimage = cat $< arch/arm/boot/*.dtb > $<.tmp ; \

That won't work well when multiple .dtb files are built.

That's completely correct! Therefore I called it "hack" (maybe forgetting to prefix it "ugly"), so please don't use it. ;-)

Roland