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://git.denx.de/u-boot-net
[platform/kernel/u-boot.git]
/
include
/
configs
/
smdk2410.h
diff --git
a/include/configs/smdk2410.h
b/include/configs/smdk2410.h
index
c5c0c2c
..
c8148bb
100644
(file)
--- a/
include/configs/smdk2410.h
+++ b/
include/configs/smdk2410.h
@@
-51,7
+51,6
@@
#define CONFIG_USB_OHCI
#define CONFIG_USB_OHCI_S3C24XX
#define CONFIG_USB_KEYBOARD
#define CONFIG_USB_OHCI
#define CONFIG_USB_OHCI_S3C24XX
#define CONFIG_USB_KEYBOARD
-#define CONFIG_USB_STORAGE
#define CONFIG_DOS_PARTITION
/************************************************************
#define CONFIG_DOS_PARTITION
/************************************************************
@@
-80,10
+79,8
@@
#define CONFIG_CMDLINE_EDITING
/* autoboot */
#define CONFIG_CMDLINE_EDITING
/* autoboot */
-#define CONFIG_BOOTDELAY 5
#define CONFIG_BOOT_RETRY_TIME -1
#define CONFIG_RESET_TO_RETRY
#define CONFIG_BOOT_RETRY_TIME -1
#define CONFIG_RESET_TO_RETRY
-#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_IPADDR 10.0.0.110
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_IPADDR 10.0.0.110