diff options
author | Max Filippov <jcmvbkbc@gmail.com> | 2012-12-10 16:26:21 -0500 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2012-12-19 00:10:26 -0500 |
commit | 055d4db1e1ef6f983c3565110fbe6737087e9103 (patch) | |
tree | 9d9e95f8a494b06dd04d959fc8c6a125eae96533 /arch/xtensa | |
parent | 33c760fbb7a8fa46314437746dd7f5540da5498e (diff) |
xtensa: don't try to build DTB when OF is disabled
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa')
-rw-r--r-- | arch/xtensa/Makefile | 2 | ||||
-rw-r--r-- | arch/xtensa/boot/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index 4276721f5ae1..0aa72702f179 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile | |||
@@ -88,7 +88,7 @@ core-y += $(buildvar) $(buildplf) | |||
88 | libs-y += arch/xtensa/lib/ $(LIBGCC) | 88 | libs-y += arch/xtensa/lib/ $(LIBGCC) |
89 | 89 | ||
90 | ifneq ($(CONFIG_BUILTIN_DTB),"") | 90 | ifneq ($(CONFIG_BUILTIN_DTB),"") |
91 | core-y += arch/xtensa/boot/ | 91 | core-$(CONFIG_OF) += arch/xtensa/boot/ |
92 | endif | 92 | endif |
93 | 93 | ||
94 | boot := arch/xtensa/boot | 94 | boot := arch/xtensa/boot |
diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile index 196bc3c967af..818647e815d7 100644 --- a/arch/xtensa/boot/Makefile +++ b/arch/xtensa/boot/Makefile | |||
@@ -28,7 +28,7 @@ bootdir-$(CONFIG_XTENSA_PLATFORM_XTFPGA) += boot-redboot boot-elf boot-uboot | |||
28 | 28 | ||
29 | BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB)).dtb.o | 29 | BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB)).dtb.o |
30 | ifneq ($(CONFIG_BUILTIN_DTB),"") | 30 | ifneq ($(CONFIG_BUILTIN_DTB),"") |
31 | obj-y += $(BUILTIN_DTB) | 31 | obj-$(CONFIG_OF) += $(BUILTIN_DTB) |
32 | endif | 32 | endif |
33 | 33 | ||
34 | # Rule to build device tree blobs | 34 | # Rule to build device tree blobs |