projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-x86
[oweals/u-boot.git]
/
configs
/
mx6qarm2_defconfig
diff --git
a/configs/mx6qarm2_defconfig
b/configs/mx6qarm2_defconfig
index 391da699de365d0349b9e77037466af07dc30256..79fa4713e561d2f5a55853a52fcf72771728fdcc 100644
(file)
--- a/
configs/mx6qarm2_defconfig
+++ b/
configs/mx6qarm2_defconfig
@@
-2,6
+2,7
@@
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_MX6QARM2=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,DDR_MB=2048"
+CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set