projects
/
platform
/
kernel
/
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://www.denx.de/git/u-boot-imx
[platform/kernel/u-boot.git]
/
configs
/
iocon_defconfig
diff --git
a/configs/iocon_defconfig
b/configs/iocon_defconfig
index
5e499d2
..
a6532d1
100644
(file)
--- a/
configs/iocon_defconfig
+++ b/
configs/iocon_defconfig
@@
-1,5
+1,9
@@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_IOCON=y
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_IOCON=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_REGEX=y
+CONFIG_FIT=y
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_NFS is not set
+CONFIG_SYS_NS16550=y