summaryrefslogtreecommitdiff
path: root/configs/zynq_microzed_defconfig
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-04-10 14:22:23 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-04-10 14:22:23 +0200
commitb491d9757d14415edcb1468ed896a704d0f0cfe7 (patch)
tree477707170048989accc9ea69cd6ac5edae7b1aec /configs/zynq_microzed_defconfig
parent79d75d752717fb4106ec49abaddbd7744c775a35 (diff)
parent385a08a60f042061b004642d6b9bb6cfb794ad5a (diff)
downloadu-boot-imx-b491d9757d14415edcb1468ed896a704d0f0cfe7.zip
u-boot-imx-b491d9757d14415edcb1468ed896a704d0f0cfe7.tar.gz
u-boot-imx-b491d9757d14415edcb1468ed896a704d0f0cfe7.tar.bz2
Merge branch 'u-boot/master'
Diffstat (limited to 'configs/zynq_microzed_defconfig')
-rw-r--r--configs/zynq_microzed_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 39a7f6b..b6bca82 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARM=y
CONFIG_ZYNQ=y
CONFIG_TARGET_ZYNQ_MICROZED=y
CONFIG_OF_CONTROL=y
+# CONFIG_SYS_MALLOC_F is not set
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y