Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit f3ef3609dbb5a9693b2ccdfd4545e73cd273d684

Authored by Nikita Kiryanov
Committed by Tom Rini
1 parent 6a1df37349
Exists in master and in 50 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

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>

Showing 1 changed file with 4 additions and 5 deletions Side-by-side Diff

include/configs/cm_t35.h
Diff comments   View file @ f3ef360
... ... @@ -102,8 +102,6 @@
102 102 #define CONFIG_USB_OMAP3
103 103 #define CONFIG_USB_EHCI
104 104 #define CONFIG_USB_EHCI_OMAP
105   -#define CONFIG_USB_ULPI
106   -#define CONFIG_USB_ULPI_VIEWPORT_OMAP
107 105 #define CONFIG_USB_STORAGE
108 106 #define CONFIG_MUSB_UDC
109 107 #define CONFIG_TWL4030_USB
... ... @@ -113,6 +111,8 @@
113 111 #define CONFIG_USB_DEVICE
114 112 #define CONFIG_USB_TTY
115 113 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
  114 +/* This delay is really for slow-to-power-on USB sticks, not the hub */
  115 +#define CONFIG_USB_HUB_MIN_POWER_ON_DELAY 500
116 116  
117 117 /* commands to include */
118 118 #include <config_cmd_default.h>
... ... @@ -174,7 +174,7 @@
174 174 #define CONFIG_EXTRA_ENV_SETTINGS \
175 175 "loadaddr=0x82000000\0" \
176 176 "usbtty=cdc_acm\0" \
177   - "console=ttyS2,115200n82,115200n8\0" \" \
  177 + "console=ttyO2,115200n82,115200n8\0" \" \
178 178 "mpurate=500\0" \
179 179 "vram=12M\0" \
180 180 "dvimode=1024x768MR-16@60\0" \
... ... @@ -188,7 +188,6 @@
188 188 "mpurate=${mpurate} " \
189 189 "vram=${vram} " \
190 190 "omapfb.mode=dvi:${dvimode} " \
191   - "omapfb.debug=y " \
192 191 "omapdss.def_disp=${defaultdisplay} " \
193 192 "root=${mmcroot} " \
194 193 "rootfstype=${mmcrootfstype}\0" \
... ... @@ -196,7 +195,6 @@
196 195 "mpurate=${mpurate} " \
197 196 "vram=${vram} " \
198 197 "omapfb.mode=dvi:${dvimode} " \
199   - "omapfb.debug=y " \
200 198 "omapdss.def_disp=${defaultdisplay} " \
201 199 "root=${nandroot} " \
202 200 "rootfstype=${nandrootfstype}\0" \
... ... @@ -212,6 +210,7 @@
212 210 "nand read ${loadaddr} 2a0000 400000; " \
213 211 "bootm ${loadaddr}\0" \
214 212  
  213 +#define CONFIG_CMD_BOOTZ
215 214 #define CONFIG_BOOTCOMMAND \
216 215 "mmc dev ${mmcdev}; if mmc rescan; then " \
217 216 "if run loadbootscript; then " \