[U-Boot] [PATCH 1/7] tegra: Drop generation of -nodtb file with OF_CONTROL

Simon Glass
2016-01-25T20:30:25Z

It seems clear that the intent is to generate u-boot-nodtb-tegra.bin only
when OF_CONTROL is not set. But due to the way the rules are set up, this
file is always generated. Fix this.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c9c2cbe..e2b6674 100644
--- a/Makefile
+++ b/Makefile
@@ -1077,8 +1077,9 @@ u-boot-nodtb-tegra.bin: spl/u-boot-spl u-boot.bin FORCE
$(call if_changed,pad_cat)

ifeq ($(CONFIG_OF_SEPARATE),y)
-u-boot-dtb-tegra.bin: u-boot-nodtb-tegra.bin dts/dt.dtb FORCE
- $(call if_changed,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
+ $(call if_changed,pad_cat)
endif
endif

--
2.7.0.rc3.207.g0ac5344