From: Michal Simek Date: Thu, 13 Nov 2014 12:22:40 +0000 (+0100) Subject: zynq: zybo: Move CONFIG_DEFAULT_DEVICE_TREE to defconfig X-Git-Tag: v2015.01-rc2~83 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a03d5c114a5e4a0bd696b0135a65746eb46c84f4;p=oweals%2Fu-boot.git zynq: zybo: Move CONFIG_DEFAULT_DEVICE_TREE to defconfig This is a MIME GnuPG-signed message. If you see this text, it means that your E-mail or Usenet software does not support MIME signed messages. The Internet standard for MIME PGP messages, RFC 2015, was published in 1996. To open this message correctly you will need to install E-mail or Usenet software that supports modern Internet standards. 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 --- diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index a00f4fcea5..12311cd83b 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 ce1527fafc..191f2a5f30 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