summaryrefslogtreecommitdiffstats
path: root/configs/zynq_zed_defconfig
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2015-06-15 12:08:11 +0200
committerStefano Babic <sbabic@denx.de>2015-06-15 12:08:11 +0200
commit212b66016120fa4cd3b8f7edbe4c9f106032884e (patch)
treef956cd9195952c7890493897a9c2108a8ee852d7 /configs/zynq_zed_defconfig
parentb31fb4b97b4d9c9fcf5a50c39d5d2c277f7008c9 (diff)
parent64d16706a052553c85d2f8f4c741879a4e3e6116 (diff)
downloadtalos-obmc-uboot-212b66016120fa4cd3b8f7edbe4c9f106032884e.tar.gz
talos-obmc-uboot-212b66016120fa4cd3b8f7edbe4c9f106032884e.zip
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'configs/zynq_zed_defconfig')
-rw-r--r--configs/zynq_zed_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index 55d58a70b0..8f94d21174 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y
CONFIG_TARGET_ZYNQ_ZED=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
# CONFIG_SYS_MALLOC_F is not set
CONFIG_SPL=y
OpenPOWER on IntegriCloud