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-uniphier
[oweals/u-boot.git]
/
configs
/
charon_defconfig
diff --git
a/configs/charon_defconfig
b/configs/charon_defconfig
index ea50729efd608ec498b50c3ae64c68319e6f917e..724441ec29aedbf6fabd7b57a84cc3cc72b810b9 100644
(file)
--- a/
configs/charon_defconfig
+++ b/
configs/charon_defconfig
@@
-2,6
+2,7
@@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_CHARON=y
CONFIG_OF_BOARD_SETUP=y
+CONFIG_BOOTDELAY=5
CONFIG_HUSH_PARSER=y
CONFIG_CMD_ASKENV=y
CONFIG_LOOPW=y
@@
-14,4
+15,6
@@
CONFIG_CMD_PING=y
CONFIG_CMD_SNTP=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
+CONFIG_USB=y
+CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y