diff options
| author | Marian Balakowicz <m8@semihalf.com> | 2008-01-08 18:11:45 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-02-07 01:12:56 +0100 |
| commit | af13cdbc01eaf88880978bfb4f603e012818ba24 (patch) | |
| tree | 87f9c7d3abf919f3ddf3dd22257b68b9bfe7505e /common/cmd_bootm.c | |
| parent | 958fc48abddeab513ea4847e34f22a2e9fe67fe1 (diff) | |
| download | blackbird-obmc-uboot-af13cdbc01eaf88880978bfb4f603e012818ba24.tar.gz blackbird-obmc-uboot-af13cdbc01eaf88880978bfb4f603e012818ba24.zip | |
[new uImage] Add memmove_wd() common routine
Move common, watchdog sensible memmove code to a helper memmmove_wd() routine.
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index aa7c0f5b77..b059336ca5 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -250,24 +250,12 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (image_get_load (hdr) == addr) { printf (" XIP %s ... ", name); } else { -#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) - size_t l = len; - void *to = (void *)image_get_load (hdr); - void *from = (void *)data; - printf (" Loading %s ... ", name); - while (l > 0) { - size_t tail = (l > CHUNKSZ) ? CHUNKSZ : l; - WATCHDOG_RESET(); - memmove (to, from, tail); - to += tail; - from += tail; - l -= tail; - } -#else /* !(CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG) */ - memmove ((void *)image_get_load (hdr), (uchar *)data, len); -#endif /* CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG */ + memmove_wd ((void *)image_get_load (hdr), + (void *)data, len, CHUNKSZ); + + puts("OK\n"); } break; case IH_COMP_GZIP: |
