diff options
| author | Simon Glass <sjg@chromium.org> | 2016-01-31 18:10:52 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-01 20:55:43 -0500 |
| commit | a9d78260a8693f5dcfc6a3b61175467c76c273b4 (patch) | |
| tree | f8bf1a174f65045b7ba363ea64305a51d5146736 | |
| parent | 03c25bcd263a47322294654b5e97f360f666ef17 (diff) | |
| download | u-boot-imx-a9d78260a8693f5dcfc6a3b61175467c76c273b4.zip u-boot-imx-a9d78260a8693f5dcfc6a3b61175467c76c273b4.tar.gz u-boot-imx-a9d78260a8693f5dcfc6a3b61175467c76c273b4.tar.bz2 | |
tegra: Always build a boot image with the same filename
Adjust the Makefile to build u-boot-tegra.bin which contains a device tree
if OF_SEPARATE is enabled, and does not if not. This mirrors U-Boot's new
approach of using u-boot.bin to handle both cases.
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -765,7 +765,7 @@ endif # enable combined SPL/u-boot/dtb rules for tegra ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy) -ALL-y += u-boot-nodtb-tegra.bin +ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin ALL-$(CONFIG_OF_SEPARATE) += u-boot-dtb-tegra.bin endif @@ -1080,9 +1080,12 @@ OBJCOPYFLAGS_u-boot-nodtb-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) u-boot-nodtb-tegra.bin: spl/u-boot-spl u-boot-nodtb.bin FORCE $(call if_changed,pad_cat) -OBJCOPYFLAGS_u-boot-dtb-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) -u-boot-dtb-tegra.bin: spl/u-boot-spl u-boot-dtb.bin FORCE +OBJCOPYFLAGS_u-boot-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) +u-boot-tegra.bin: spl/u-boot-spl u-boot-dtb.bin FORCE $(call if_changed,pad_cat) + +u-boot-dtb-tegra.bin: u-boot-tegra.bin FORCE + $(call if_changed,copy) endif OBJCOPYFLAGS_u-boot-app.efi := $(OBJCOPYFLAGS_EFI) |