Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit e94d2cd9d1dc0f58b18e7c31fc9345129b1a44fb

Authored by wdenk
1 parent c3f4d17e05
Exists in master and in 54 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, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, 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

* Fix "cls" command when used with splash screen 

* Increase NFS download timeout (now 1 min - 10 sec is to short for a
  slow download of a big image)

Showing 4 changed files with 10 additions and 3 deletions Side-by-side Diff

... ... @@ -2,6 +2,11 @@
2 2 Changes since U-Boot 1.1.1:
3 3 ======================================================================
4 4  
  5 +* Fix "cls" command when used with splash screen
  6 +
  7 +* Increase NFS download timeout (now 1 min - 10 sec is to short for a
  8 + slow download of a big image)
  9 +
5 10 * Add "cls" function to MPC823 LCD driver so we can reinitialize the
6 11 display even after showing a bitmap
7 12  
... ... @@ -895,7 +895,7 @@
895 895 If this option is set, the environment is checked for
896 896 a variable "splashimage". If found, the usual display
897 897 of logo, copyright and system information on the LCD
898   - is supressed and the BMP image at the address
  898 + is suppressed and the BMP image at the address
899 899 specified in "splashimage" is loaded instead. The
900 900 console is redirected to the "nulldev", too. This
901 901 allows for a "silent" boot where a splash screen is
... ... @@ -1333,9 +1333,11 @@
1333 1333 #ifdef CONFIG_SPLASH_SCREEN
1334 1334 char *s;
1335 1335 ulong addr;
  1336 + static int do_splash = 1;
1336 1337  
1337   - if ((s = getenv("splashimage")) != NULL) {
  1338 + if (do_splash && (s = getenv("splashimage")) != NULL) {
1338 1339 addr = simple_strtoul(s, NULL, 16);
  1340 + do_splash = 0;
1339 1341  
1340 1342 if (lcd_display_bitmap (addr, 0, 0) == 0) {
1341 1343 return ((void *)lcd_base);
... ... @@ -34,7 +34,7 @@
34 34 #if ((CONFIG_COMMANDS & CFG_CMD_NET) && (CONFIG_COMMANDS & CFG_CMD_NFS))
35 35  
36 36 #define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */
37   -#define NFS_TIMEOUT 10
  37 +#define NFS_TIMEOUT 60
38 38  
39 39 static int fs_mounted = 0;
40 40 static unsigned long rpc_id = 0;