diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_fdos.c | 2 | ||||
| -rw-r--r-- | common/cmd_jffs2.c | 2 | ||||
| -rw-r--r-- | common/main.c | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c index 763f418..4b411b3 100644 --- a/common/cmd_fdos.c +++ b/common/cmd_fdos.c @@ -53,7 +53,7 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) /* pre-set Boot file name */ if ((name = getenv("bootfile")) == NULL) { - name = "pImage"; + name = "uImage"; } switch (argc) { diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c index fc1d9c4..8df8061 100644 --- a/common/cmd_jffs2.c +++ b/common/cmd_jffs2.c @@ -83,7 +83,7 @@ jffs2_part_info(int part_num) int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { - char *filename = "pImage"; + char *filename = "uImage"; ulong offset = CFG_LOAD_ADDR; int size; struct part_info *part; diff --git a/common/main.c b/common/main.c index 401efcf..9ee32a5 100644 --- a/common/main.c +++ b/common/main.c @@ -640,8 +640,6 @@ static void process_macros (const char *input, char *output) case 0: /* Waiting for (unescaped) $ */ if ((c == '\'') && (prev != '\\')) { state = 3; - if (inputcnt) - inputcnt--; break; } if ((c == '$') && (prev != '\\')) { @@ -694,8 +692,6 @@ static void process_macros (const char *input, char *output) case 3: /* Waiting for ' */ if ((c == '\'') && (prev != '\\')) { state = 0; - if (inputcnt) - inputcnt--; } else { *(output++) = c; outputcnt--; |