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 'u-boot-ti/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
include
/
configs
/
cm_t35.h
diff --git
a/include/configs/cm_t35.h
b/include/configs/cm_t35.h
index aae05e0333039c2647fc1571ed04d38f80d61888..5c484ef07882510cc02dd839b12c1e9530fee5f9 100644
(file)
--- a/
include/configs/cm_t35.h
+++ b/
include/configs/cm_t35.h
@@
-104,8
+104,6
@@
#define CONFIG_USB_DEVICE
#define CONFIG_USB_TTY
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_USB_DEVICE
#define CONFIG_USB_TTY
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-/* This delay is really for slow-to-power-on USB sticks, not the hub */
-#define CONFIG_USB_HUB_MIN_POWER_ON_DELAY 500
/* commands to include */
#include <config_cmd_default.h>
/* commands to include */
#include <config_cmd_default.h>
@@
-158,7
+156,6
@@
/* CS0 */
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
/* devices */
/* CS0 */
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
/* devices */
-#define GPMC_NAND_ECC_LP_x8_LAYOUT
/* Environment information */
#define CONFIG_BOOTDELAY 3
/* Environment information */
#define CONFIG_BOOTDELAY 3