Move CONFIG_DEFAULT_DEVICE_TREE from board config directly to defconfig.

This patch removes compilation warning: include/configs/zynq_zybo.h:24:0: warning: "CONFIG_DEFAULT_DEVICE_TREE" redefined [enabled by default] #define CONFIG_DEFAULT_DEVICE_TREE zynq-zybo

Signed-off-by: Michal Simek michal.simek@xilinx.com ---

configs/zynq_zybo_defconfig | 2 ++ include/configs/zynq_zybo.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index a00f4fcea5b7..12311cd83b50 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 ce1527fafc51..191f2a5f301e 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 -- 1.8.2.3