Skip to content
  • Simon Glass's avatar
    Makefile: Drop unnecessary -dtb suffixes · 33855574
    Simon Glass authored
    
    
    When OF_CONTROL is enabled, u-boot-dtb.* files are the same as u-boot.*
    files. So we can use the latter for simplicity.
    
    Signed-off-by: Simon Glass's avatarSimon Glass <sjg@chromium.org>
    Series-to: u-boot
    Series-cc: tegra, trini, hans
    Series-version: 3
    Series-changes: 2
    - Tweak the tegra rule slightly
    
    Cover-letter:
    fdt: Replace u-boot-dtb.bin with u-boot.bin
    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
    OF_CONTROL.
    END
    33855574