Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit b76a147b722565bde046f707a5cc92df8ea29738

Authored by Phil Sutter
Committed by Scott Wood
1 parent fcecb4a52c
Exists in master and in 53 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, 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

env_nand.c: clarify log messages when env reading fails 

The single message is misleading, since there is no equivalent success
note when reading the other copy succeeds. Instead, warn if one of the
redundant copies could not be loaded and emphasise on the error when
reading both fails.

Signed-off-by: Phil Sutter <phil.sutter@viprinet.com>

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

... ... @@ -331,6 +331,7 @@
331 331 void env_relocate_spec(void)
332 332 {
333 333 #if !defined(ENV_IS_EMBEDDED)
  334 + int read1_fail = 0, read2_fail = 0;
334 335 int crc1_ok = 0, crc2_ok = 0;
335 336 env_t *ep, *tmp_env1, *tmp_env2;
336 337  
337 338  
... ... @@ -342,11 +343,14 @@
342 343 goto done;
343 344 }
344 345  
345   - if (readenv(CONFIG_ENV_OFFSET, (u_char *) tmp_env1))
346   - puts("No Valid Environment Area found\n");
  346 + read1_fail = readenv(CONFIG_ENV_OFFSET, (u_char *) tmp_env1);
  347 + read2_fail = readenv(CONFIG_ENV_OFFSET_REDUND, (u_char *) tmp_env2);
347 348  
348   - if (readenv(CONFIG_ENV_OFFSET_REDUND, (u_char *) tmp_env2))
349   - puts("No Valid Redundant Environment Area found\n");
  349 + if (read1_fail && read2_fail)
  350 + puts("*** Error - No Valid Environment Area found\n");
  351 + else if (read1_fail || read2_fail)
  352 + puts("*** Warning - some problems detected "
  353 + "reading environment; recovered successfully\n");
350 354  
351 355 crc1_ok = crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc;
352 356 crc2_ok = crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc;