[U-Boot] [PATCH] NAND: Have nboot accept .e and .i as legacy no-ops.
This was intended to happen before, but a trivial bug prevented it.
Signed-off-by: Scott Wood scottwood@freescale.com --- Applied to u-boot-nand-flash.
common/cmd_nand.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/common/cmd_nand.c b/common/cmd_nand.c index f915fb6..e6623ca 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -502,7 +502,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
s = strchr(cmd, '.'); if (s != NULL && - (strcmp(s, ".jffs2") && !strcmp(s, ".e") && !strcmp(s, ".i"))) { + (strcmp(s, ".jffs2") && strcmp(s, ".e") && strcmp(s, ".i"))) { printf("Unknown nand load suffix '%s'\n", s); show_boot_progress(-53); return 1;
On Tuesday 17 March 2009 13:10:15 Scott Wood wrote:
--- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -502,7 +502,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
s = strchr(cmd, '.'); if (s != NULL &&
(strcmp(s, ".jffs2") && !strcmp(s, ".e") && !strcmp(s, ".i"))) {
(strcmp(s, ".jffs2") && strcmp(s, ".e") && strcmp(s, ".i"))) {
unrelated to the bug in question, but perhaps better written like: if (s++ != NULL && (strcmp(s, "jffs2") && strcmp(s, "e") && strcmp(s, "i"))) { -mike
On Tue, Mar 17, 2009 at 01:49:20PM -0400, Mike Frysinger wrote:
On Tuesday 17 March 2009 13:10:15 Scott Wood wrote:
--- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -502,7 +502,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
s = strchr(cmd, '.'); if (s != NULL &&
(strcmp(s, ".jffs2") && !strcmp(s, ".e") && !strcmp(s, ".i"))) {
(strcmp(s, ".jffs2") && strcmp(s, ".e") && strcmp(s, ".i"))) {unrelated to the bug in question, but perhaps better written like: if (s++ != NULL && (strcmp(s, "jffs2") && strcmp(s, "e") && strcmp(s, "i"))) {
That'd make s non-NULL and invalid, if it started out as NULL. Even if s is not referenced again, it's not a nice thing to leave lurking in the code.
-Scott
On Tuesday 17 March 2009 13:55:18 Scott Wood wrote:
On Tue, Mar 17, 2009 at 01:49:20PM -0400, Mike Frysinger wrote:
On Tuesday 17 March 2009 13:10:15 Scott Wood wrote:
--- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -502,7 +502,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
s = strchr(cmd, '.'); if (s != NULL &&
(strcmp(s, ".jffs2") && !strcmp(s, ".e") && !strcmp(s, ".i"))) {
(strcmp(s, ".jffs2") && strcmp(s, ".e") && strcmp(s, ".i"))) {unrelated to the bug in question, but perhaps better written like: if (s++ != NULL && (strcmp(s, "jffs2") && strcmp(s, "e") && strcmp(s, "i"))) {
That'd make s non-NULL and invalid, if it started out as NULL. Even if s is not referenced again, it's not a nice thing to leave lurking in the code.
i know it does, but since s isnt used again in the code in the NULL case, it doesnt matter. but if you want to be pedantic, it's easy enough to split the operations. if (s != NULL && ++s && .... -mike
participants (2)
-
Mike Frysinger -
Scott Wood