diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index a00f4fcea5b745febac25e862eeb0418dbf6c7f2..12311cd83b5011f35ff2b69737ad24c7b1fb9f9f 100644
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -2,3 +2,5 @@ CONFIG_SPL=y
 +S:CONFIG_ARM=y
 +S:CONFIG_ZYNQ=y
 +S:CONFIG_TARGET_ZYNQ_ZYBO=y
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo"
diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
index ce1527fafc5134dde324d14cd0f8f5a5d964230b..191f2a5f301e2f8a817cb01a803852a2eb6cff49 100644
--- a/include/configs/zynq_zybo.h
+++ b/include/configs/zynq_zybo.h
@@ -21,7 +21,6 @@
 
 #define CONFIG_ZYNQ_SDHCI0
 #define CONFIG_ZYNQ_BOOT_FREEBSD
-#define CONFIG_DEFAULT_DEVICE_TREE	zynq-zybo
 
 /* Define ZYBO PS Clock Frequency to 50MHz */
 #define CONFIG_ZYNQ_PS_CLK_FREQ	50000000UL