| Message ID | 1386777880-22993-1-git-send-email-nikita@compulab.co.il |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On 11.12.2013 17:04, Nikita Kiryanov wrote: > 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. Yes, I had this on my list as well. :) > 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> Thanks, Stefan
On Wed, Dec 11, 2013 at 06:04:40PM +0200, Nikita Kiryanov wrote: > 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> Applied to u-boot-ti/master, thanks!
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index f4ecd0d..f38cac1 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -104,8 +104,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 @@ -115,6 +113,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> @@ -176,7 +176,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" \ @@ -190,7 +190,6 @@ "mpurate=${mpurate} " \ "vram=${vram} " \ "omapfb.mode=dvi:${dvimode} " \ - "omapfb.debug=y " \ "omapdss.def_disp=${defaultdisplay} " \ "root=${mmcroot} " \ "rootfstype=${mmcrootfstype}\0" \ @@ -198,7 +197,6 @@ "mpurate=${mpurate} " \ "vram=${vram} " \ "omapfb.mode=dvi:${dvimode} " \ - "omapfb.debug=y " \ "omapdss.def_disp=${defaultdisplay} " \ "root=${nandroot} " \ "rootfstype=${nandrootfstype}\0" \ @@ -214,6 +212,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 " \