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 http://git.denx.de/u-boot-mmc
[platform/kernel/u-boot.git]
/
configs
/
canmb_defconfig
diff --git
a/configs/canmb_defconfig
b/configs/canmb_defconfig
index
5caea0d
..
ae8e040
100644
(file)
--- a/
configs/canmb_defconfig
+++ b/
configs/canmb_defconfig
@@
-1,6
+1,10
@@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_CANMB=y
+CONFIG_BOOTDELAY=5
+CONFIG_CMD_ASKENV=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_DHCP=y
+CONFIG_CMD_MII=y
CONFIG_CMD_SNTP=y
+# CONFIG_PCI is not set