summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2014-11-13 13:22:40 +0100
committerTom Rini <trini@ti.com>2014-11-13 08:38:22 -0500
commita03d5c114a5e4a0bd696b0135a65746eb46c84f4 (patch)
tree222b733138ff9a2b1b9f44168f23bff9964172e9 /configs
parent3deb013ae780c19f40b0704a7f421ad479962618 (diff)
downloadtalos-obmc-uboot-a03d5c114a5e4a0bd696b0135a65746eb46c84f4.tar.gz
talos-obmc-uboot-a03d5c114a5e4a0bd696b0135a65746eb46c84f4.zip
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 <michal.simek@xilinx.com>
Diffstat (limited to 'configs')
-rw-r--r--configs/zynq_zybo_defconfig2
1 files changed, 2 insertions, 0 deletions
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"
OpenPOWER on IntegriCloud