diff options
| author | Stefan Roese <sr@denx.de> | 2008-09-08 10:35:49 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-09-08 10:35:49 +0200 |
| commit | c351575c226eaad85f12b0d346e762260b263531 (patch) | |
| tree | c2c1748a95c589278cbf048c191728fd5a9ea753 /common/cmd_load.c | |
| parent | ac53ee8318678190bf3c68da477a84a657d86fb0 (diff) | |
| parent | 302e52e0b1d4c7f994991709d0cb6c3ea612cdb5 (diff) | |
| download | u-boot-imx-c351575c226eaad85f12b0d346e762260b263531.zip u-boot-imx-c351575c226eaad85f12b0d346e762260b263531.tar.gz u-boot-imx-c351575c226eaad85f12b0d346e762260b263531.tar.bz2 | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'common/cmd_load.c')
| -rw-r--r-- | common/cmd_load.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common/cmd_load.c b/common/cmd_load.c index f2b73bd..1351fe2 100644 --- a/common/cmd_load.c +++ b/common/cmd_load.c @@ -38,7 +38,7 @@ static ulong load_serial_ymodem (ulong offset); #endif #if defined(CONFIG_CMD_LOADS) -static ulong load_serial (ulong offset); +static ulong load_serial (long offset); static int read_record (char *buf, ulong len); # if defined(CONFIG_CMD_SAVES) static int save_serial (ulong offset, ulong size); @@ -53,7 +53,7 @@ static int do_echo = 1; #if defined(CONFIG_CMD_LOADS) int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { - ulong offset = 0; + long offset = 0; ulong addr; int i; char *env_echo; @@ -72,7 +72,7 @@ int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #ifdef CFG_LOADS_BAUD_CHANGE if (argc >= 2) { - offset = simple_strtoul(argv[1], NULL, 16); + offset = simple_strtol(argv[1], NULL, 16); } if (argc == 3) { load_baudrate = (int)simple_strtoul(argv[2], NULL, 10); @@ -95,7 +95,7 @@ int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } #else /* ! CFG_LOADS_BAUD_CHANGE */ if (argc == 2) { - offset = simple_strtoul(argv[1], NULL, 16); + offset = simple_strtol(argv[1], NULL, 16); } #endif /* CFG_LOADS_BAUD_CHANGE */ @@ -141,7 +141,7 @@ int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } static ulong -load_serial (ulong offset) +load_serial (long offset) { char record[SREC_MAXRECLEN + 1]; /* buffer for one S-Record */ char binbuf[SREC_MAXBINLEN]; /* buffer for binary data */ |