diff options
author | Max Filippov <jcmvbkbc@gmail.com> | 2012-12-11 01:26:21 +0400 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2012-12-18 21:10:26 -0800 |
commit | 055d4db1e1ef6f983c3565110fbe6737087e9103 (patch) | |
tree | 9d9e95f8a494b06dd04d959fc8c6a125eae96533 | |
parent | 33c760fbb7a8fa46314437746dd7f5540da5498e (diff) | |
download | linux-3.10-055d4db1e1ef6f983c3565110fbe6737087e9103.tar.gz linux-3.10-055d4db1e1ef6f983c3565110fbe6737087e9103.tar.bz2 linux-3.10-055d4db1e1ef6f983c3565110fbe6737087e9103.zip |
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>
-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 4276721f5ae..0aa72702f17 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile @@ -88,7 +88,7 @@ core-y += $(buildvar) $(buildplf) libs-y += arch/xtensa/lib/ $(LIBGCC) ifneq ($(CONFIG_BUILTIN_DTB),"") -core-y += arch/xtensa/boot/ +core-$(CONFIG_OF) += arch/xtensa/boot/ endif boot := arch/xtensa/boot diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile index 196bc3c967a..818647e815d 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 BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB)).dtb.o ifneq ($(CONFIG_BUILTIN_DTB),"") -obj-y += $(BUILTIN_DTB) +obj-$(CONFIG_OF) += $(BUILTIN_DTB) endif # Rule to build device tree blobs |