[U-Boot] [PATCH v3 0/7] fdt: Replace u-boot-dtb.bin with u-boot.bin

Simon Glass sjg at chromium.org
Mon Feb 1 02:10:48 CET 2016

At present u-boot.bin holds the plain U-Boot binary without the device tree.
This is somewhat annoying since you need either u-boot.bin or u-boot-dtb.bin
depending on whether device tree is used.

This series adjusts the build such that u-boot.bin includes a device tree if
enabled, and the plain binary is in u-boot-nodtb.bin. For now u-boot-dtb.bin
remains the same.

This should be acceptable since:

- without OF_CONTROL, u-boot.bin still does not include a device tree
- with OF_CONTROL, u-boot-dtb.bin does not change

The main impact is to build systems which are set up to use u-boot.bin as
the output file and then add a device tree. These will have to change to use
u-boot-nodtb.bin instead.

The original decision to use a separate u-boot-dtb.bin was aimed at allowing
any device tree file to be concatenated to the u-boot.bin image after the
build. However this no-longer seems so important. More important is the
convenience of using the same output file regardless of the setting for

Changes in v3:
- Fix build error when CONFIG_OF_EMBED is used
- Drop unnecessary ifdef around Makefile rule
- Adjust rules based on Masahiro's expert comments
- Use cmd_copy instead of cmd_cat
- Drop an unnecessary rule
- Update commit message to say OF_SEPARATE instead of OF_CONTROL
- Rewrite the commit message for clarity

Changes in v2:
- Rewrite this commit based on tegra feedback
- Update based on previous changes
- Fix the update_filename in MCV
- Tweak the tegra rule slightly

Simon Glass (7):
  tegra: Clarify generation of -nodtb file with OF_CONTROL
  fdt: Build a U-Boot binary without device tree
  fdt: Build an SPL binary without device tree
  tegra: Always build a boot image with the same filename
  socfpga: Simplify Makefile filenames
  Makefile: Make u-boot.img the same as u-boot-dtb.img
  Makefile: Drop unnecessary -dtb suffixes

 Makefile                         | 89 +++++++++++++++++++---------------------
 include/configs/socfpga_mcvevk.h |  2 +-
 scripts/Makefile.spl             | 31 ++++++++------
 3 files changed, 63 insertions(+), 59 deletions(-)


More information about the U-Boot mailing list