diff options
| author | wdenk <wdenk> | 2003-03-12 10:41:04 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-03-12 10:41:04 +0000 |
| commit | 3bac351370ef7cbf9d2af27ba52bee1703ad677e (patch) | |
| tree | 689fbd22fcde4e63a0f4909acb3ea65475099e9c /common | |
| parent | 1cb8e980c41e86760fa93de63f4e4cf643bef9d9 (diff) | |
| download | blackbird-obmc-uboot-3bac351370ef7cbf9d2af27ba52bee1703ad677e.tar.gz blackbird-obmc-uboot-3bac351370ef7cbf9d2af27ba52bee1703ad677e.zip | |
* Patch by Josef Wagner, 12 Mar 2003:
- 16/32 MB and 50/80 MHz support with auto-detection for IP860
- ETH05 and BEDBUG support for CU824
- added support for MicroSys CPC45
- new BOOTROM/FLASH0 and DOC base for PM826
* Patch by Robert Schwebel, 12 Mar 2003:
Fix the chpart command on innokom board
* Name cleanup:
mv include/asm-i386/ppcboot-i386.h include/asm-i386/u-boot-i386.h
s/PPCBoot/U-Boot/ in some files
s/pImage/uImage/ in some files
* Patch by Detlev Zundel, 15 Jan 2003:
Fix '' command line quoting
* Patch by The LEOX team, 19 Jan 2003:
- add support for the ELPT860 board
- add support for Dallas ds164x RTC
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 763f4181ac..4b411b3d37 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 fc1d9c40f2..8df80612a7 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 401efcf854..9ee32a5804 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--; |
