summaryrefslogtreecommitdiff
path: root/configs/mx53ard_defconfig
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-07-07 09:38:44 (GMT)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-07-07 09:38:44 (GMT)
commit6f43ba70d15e15a08c25b3d956c70addb6740737 (patch)
treee5ddc8498043c0c47559737ea60e4d7fc866e20a /configs/mx53ard_defconfig
parent003b09dad492ebc385b28067b8028a0c0ff9323f (diff)
parent9c6b05cb724e18d1db3f9e1a75b2272572f06fbd (diff)
downloadu-boot-fsl-qoriq-6f43ba70d15e15a08c25b3d956c70addb6740737.tar.xz
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Diffstat (limited to 'configs/mx53ard_defconfig')
-rw-r--r--configs/mx53ard_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/configs/mx53ard_defconfig b/configs/mx53ard_defconfig
index 85fbaf6..8f233c9 100644
--- a/configs/mx53ard_defconfig
+++ b/configs/mx53ard_defconfig
@@ -1,5 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX53ARD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53ard/imximage_dd3.cfg"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set