projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 33c760f)
xtensa: don't try to build DTB when OF is disabled
authorMax Filippov <jcmvbkbc@gmail.com>
Mon, 10 Dec 2012 21:26:21 +0000 (01:26 +0400)
committerChris Zankel <chris@zankel.net>
Wed, 19 Dec 2012 05:10:26 +0000 (21:10 -0800)
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
arch/xtensa/Makefile patch | blob | blame | history
arch/xtensa/boot/Makefile patch | blob | blame | history

diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 4276721f5ae1b1d3de564a0b6c1765d80b41e503..0aa72702f1796b1892258ba995c4128a9df00a7b 100644 (file)
--- 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 196bc3c967af21e6ae2502ee7c298c0d08554caa..818647e815d7e4bb6812668d56f7db6f2d9d5c32 100644 (file)
--- 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