summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNikita Kiryanov <nikita@compulab.co.il>2013-12-11 18:04:40 +0200
committerTom Rini <trini@ti.com>2013-12-12 17:43:38 -0500
commitf3ef3609dbb5a9693b2ccdfd4545e73cd273d684 (patch)
tree261fcfca1562f1892b7fee14ac9820e2088687a0 /include
parent6a1df37349d6a01c505ffe5e11e5f623f3d9652e (diff)
downloadu-boot-imx-f3ef3609dbb5a9693b2ccdfd4545e73cd273d684.zip
u-boot-imx-f3ef3609dbb5a9693b2ccdfd4545e73cd273d684.tar.gz
u-boot-imx-f3ef3609dbb5a9693b2ccdfd4545e73cd273d684.tar.bz2
arm: omap: cm_t35: update config file
This patch makes the following updates to the cm_t35 config file: - Replace "ttyS" in default environment kernel bootargs with the new "ttyO" notation. - Remove "omapfb.debug=y" from default environment kernel bootargs. - Define a minimal power-on delay for USB hub ports so that slow-to-power-on USB sticks will have enough time to become responsive. - Add support for bootz command - ulpi_reset is not necessary and always fails with the following error message: "ULPI: ulpi_reset: failed writing reset bit" So, remove it. Cc: Tom Rini <trini@ti.com> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il> Acked-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include')
-rw-r--r--include/configs/cm_t35.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 2917819..4640c43 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -102,8 +102,6 @@
#define CONFIG_USB_OMAP3
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_OMAP
-#define CONFIG_USB_ULPI
-#define CONFIG_USB_ULPI_VIEWPORT_OMAP
#define CONFIG_USB_STORAGE
#define CONFIG_MUSB_UDC
#define CONFIG_TWL4030_USB
@@ -113,6 +111,8 @@
#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>
@@ -174,7 +174,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x82000000\0" \
"usbtty=cdc_acm\0" \
- "console=ttyS2,115200n8\0" \
+ "console=ttyO2,115200n8\0" \
"mpurate=500\0" \
"vram=12M\0" \
"dvimode=1024x768MR-16@60\0" \
@@ -188,7 +188,6 @@
"mpurate=${mpurate} " \
"vram=${vram} " \
"omapfb.mode=dvi:${dvimode} " \
- "omapfb.debug=y " \
"omapdss.def_disp=${defaultdisplay} " \
"root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
@@ -196,7 +195,6 @@
"mpurate=${mpurate} " \
"vram=${vram} " \
"omapfb.mode=dvi:${dvimode} " \
- "omapfb.debug=y " \
"omapdss.def_disp=${defaultdisplay} " \
"root=${nandroot} " \
"rootfstype=${nandrootfstype}\0" \
@@ -212,6 +210,7 @@
"nand read ${loadaddr} 2a0000 400000; " \
"bootm ${loadaddr}\0" \
+#define CONFIG_CMD_BOOTZ
#define CONFIG_BOOTCOMMAND \
"mmc dev ${mmcdev}; if mmc rescan; then " \
"if run loadbootscript; then " \