summaryrefslogtreecommitdiff
path: root/configs/zynq_zc770_xm012_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-07-01 15:38:12 -0400
committerTom Rini <trini@konsulko.com>2015-07-01 15:38:12 -0400
commit891b487098ee2169a16b1bbb354aaef28aa90630 (patch)
treedac06e8de18355c574eaf47fe29d75873ce0fda6 /configs/zynq_zc770_xm012_defconfig
parent6762ae68887d962e1a4be193672005bdefd3ee32 (diff)
parent8aa5f1d971df0f668144759991e19b5195606a32 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'configs/zynq_zc770_xm012_defconfig')
-rw-r--r--configs/zynq_zc770_xm012_defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig
index 0d5c77ee41..73ed13d9be 100644
--- a/configs/zynq_zc770_xm012_defconfig
+++ b/configs/zynq_zc770_xm012_defconfig
@@ -9,5 +9,3 @@ CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
# CONFIG_CMD_SETEXPR is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y