diff --git a/[refs] b/[refs]
index 8fa72d2dd3f4..2192ce6241b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33c760fbb7a8fa46314437746dd7f5540da5498e
+refs/heads/master: 055d4db1e1ef6f983c3565110fbe6737087e9103
diff --git a/trunk/arch/xtensa/Makefile b/trunk/arch/xtensa/Makefile
index 4276721f5ae1..0aa72702f179 100644
--- a/trunk/arch/xtensa/Makefile
+++ b/trunk/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/trunk/arch/xtensa/boot/Makefile b/trunk/arch/xtensa/boot/Makefile
index 196bc3c967af..818647e815d7 100644
--- a/trunk/arch/xtensa/boot/Makefile
+++ b/trunk/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