summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAlbert ARIBAUD <[email protected]>2013-12-18 21:45:34 +0100
committerAlbert ARIBAUD <[email protected]>2013-12-18 21:45:34 +0100
commitfe7f0810ddf41939bbdd22fe39b0b80fdfe0636b (patch)
tree7ae945711f3b37183fef66e694cedd35f8e722e9 /Makefile
parentf4e4aadeaddaf148f02f52b9e24ea19ab84f3475 (diff)
parent766afc3dff35f8f257deb0373735a328c8206880 (diff)
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 7310c4ef0af..0d86b555d70 100644
--- a/Makefile
+++ b/Makefile
@@ -350,12 +350,14 @@ endif
# enable combined SPL/u-boot/dtb rules for tegra
ifneq ($(CONFIG_TEGRA),)
+ifeq ($(CONFIG_SPL),y)
ifeq ($(CONFIG_OF_SEPARATE),y)
ALL-y += $(obj)u-boot-dtb-tegra.bin
else
ALL-y += $(obj)u-boot-nodtb-tegra.bin
endif
endif
+endif
build := -f $(TOPDIR)/scripts/Makefile.build -C