From: Scott Wood <scottwood@freescale.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/4] env_nand.c: do warn only if really no valid environment could be loaded
Date: Tue, 19 Feb 2013 18:33:23 -0600 [thread overview]
Message-ID: <1361320403.29654.11@snotra> (raw)
In-Reply-To: <1353502761-12640-3-git-send-email-phil.sutter@viprinet.com> (from phil.sutter@viprinet.com on Wed Nov 21 06:59:20 2012)
On 11/21/2012 06:59:20 AM, Phil Sutter wrote:
> The warning is misleading, since there is no equivalent success note
> when reading the other copy succeeds.
>
> Signed-off-by: Phil Sutter <phil.sutter@viprinet.com>
> ---
> common/env_nand.c | 9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/common/env_nand.c b/common/env_nand.c
> index 895532b..58ba558 100644
> --- a/common/env_nand.c
> +++ b/common/env_nand.c
> @@ -315,6 +315,7 @@ int get_nand_env_oob(nand_info_t *nand, unsigned
> long *result)
> void env_relocate_spec(void)
> {
> #if !defined(ENV_IS_EMBEDDED)
> + int read1_fail = 0, read2_fail = 0;
> int crc1_ok = 0, crc2_ok = 0;
> env_t *ep, *tmp_env1, *tmp_env2;
>
> @@ -326,11 +327,11 @@ void env_relocate_spec(void)
> goto done;
> }
>
> - if (readenv(CONFIG_ENV_OFFSET, (u_char *) tmp_env1))
> - puts("No Valid Environment Area found\n");
> + read1_fail = readenv(CONFIG_ENV_OFFSET, (u_char *) tmp_env1);
> + read2_fail = readenv(CONFIG_ENV_OFFSET_REDUND, (u_char *)
> tmp_env2);
>
> - if (readenv(CONFIG_ENV_OFFSET_REDUND, (u_char *) tmp_env2))
> - puts("No Valid Redundant Environment Area found\n");
> + if (read1_fail && read2_fail)
> + puts("No Valid Environment Area found\n");
>
> crc1_ok = crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc;
> crc2_ok = crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc;
We should still say something if one of the copies failed to load -- we
just need to word it better (see env_flash.c for an example).
-Scott
next prev parent reply other threads:[~2013-02-20 0:33 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-21 12:59 [U-Boot] [PATCH 1/4] Optimized nand_read_buf for kirkwood Phil Sutter
2012-11-21 12:59 ` [U-Boot] [PATCH 2/4] env_nand.c: support falling back to redundant env when writing Phil Sutter
2012-11-27 22:04 ` Scott Wood
2012-11-28 21:06 ` Phil Sutter
2012-12-06 18:18 ` Scott Wood
2012-12-07 11:53 ` Phil Sutter
2012-12-07 16:58 ` Phil Sutter
2012-12-07 17:38 ` Scott Wood
2012-12-10 13:41 ` Phil Sutter
2012-12-11 23:12 ` Scott Wood
2012-12-20 21:28 ` Phil Sutter
2012-12-20 21:41 ` Scott Wood
2012-12-21 10:34 ` Phil Sutter
2012-12-22 2:29 ` Scott Wood
2012-11-21 12:59 ` [U-Boot] [PATCH 3/4] env_nand.c: do warn only if really no valid environment could be loaded Phil Sutter
2012-11-27 22:06 ` Scott Wood
2012-11-27 22:07 ` Scott Wood
2013-02-20 0:33 ` Scott Wood [this message]
2012-11-21 12:59 ` [U-Boot] [PATCH 4/4] common/env_nand.c: calculate crc only when readenv was OK Phil Sutter
2012-11-26 3:46 ` [U-Boot] [PATCH 1/4] Optimized nand_read_buf for kirkwood Prafulla Wadaskar
2012-11-26 10:29 ` Phil Sutter
2012-11-26 10:33 ` Phil Sutter
2012-11-26 23:39 ` Scott Wood
2012-12-20 6:44 ` Prafulla Wadaskar
2012-12-20 10:55 ` Phil Sutter
2013-02-21 17:21 ` [U-Boot] Version 2 of Kirkwood and env_nand improvements Phil Sutter
2013-02-21 17:21 ` [U-Boot] [PATCHv2 1/4] Optimized nand_read_buf for kirkwood (V3) Phil Sutter
2013-02-23 1:26 ` Scott Wood
2013-02-21 17:21 ` [U-Boot] [PATCHv2 2/4] env_nand.c: support falling back to redundant env when writing Phil Sutter
2013-02-23 1:32 ` Scott Wood
2013-02-21 17:21 ` [U-Boot] [PATCHv2 3/4] env_nand.c: clarify log messages when env reading fails Phil Sutter
2013-02-23 1:59 ` Scott Wood
2013-02-25 9:39 ` Phil Sutter
2013-02-25 22:40 ` Scott Wood
2013-02-21 17:21 ` [U-Boot] [PATCHv2 4/4] common/env_nand.c: calculate crc only when readenv was OK Phil Sutter
2013-02-23 2:00 ` Scott Wood
2013-06-26 18:25 ` [U-Boot] Version 3 of Kirkwood and env_nand improvements Phil Sutter
2013-06-26 18:25 ` [U-Boot] [PATCH v3 1/2] Optimized nand_read_buf for kirkwood Phil Sutter
2013-06-27 10:02 ` Albert ARIBAUD
2013-08-19 23:29 ` [U-Boot] [U-Boot,v3,1/2] " Scott Wood
2013-06-26 18:25 ` [U-Boot] [PATCH v3 2/2] env_nand.c: support falling back to redundant env when writing Phil Sutter
2013-07-17 22:25 ` Scott Wood
2013-07-19 10:09 ` Phil Sutter
2013-07-19 10:20 ` [U-Boot] [PATCH] " Phil Sutter
2013-07-19 10:30 ` Phil Sutter
2013-08-22 22:50 ` [U-Boot] " Scott Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1361320403.29654.11@snotra \
--to=scottwood@freescale.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox