V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[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>
This commit is contained in:
Marian Balakowicz 2008-01-08 18:11:45 +01:00 committed by Wolfgang Denk
parent 958fc48abd
commit af13cdbc01
5 changed files with 31 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/cmd_bootm.c
View File

@ -250,24 +250,12 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
if (image_get_load (hdr) == addr) { if (image_get_load (hdr) == addr) {
printf (" XIP %s ... ", name); printf (" XIP %s ... ", name);
} else { } 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); printf (" Loading %s ... ", name);
while (l > 0) { memmove_wd ((void *)image_get_load (hdr),
size_t tail = (l > CHUNKSZ) ? CHUNKSZ : l; (void *)data, len, CHUNKSZ);
WATCHDOG_RESET();
memmove (to, from, tail); puts("OK\n");
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 */
} }
break; break;
case IH_COMP_GZIP: case IH_COMP_GZIP:

18
common/image.c
View File

@ -57,6 +57,7 @@ int image_check_dcrc (image_header_t *hdr)
return (dcrc == image_get_dcrc (hdr)); return (dcrc == image_get_dcrc (hdr));
} }
#ifndef USE_HOSTCC
int image_check_dcrc_wd (image_header_t *hdr, ulong chunksz) int image_check_dcrc_wd (image_header_t *hdr, ulong chunksz)
{ {
ulong dcrc = 0; ulong dcrc = 0;
@ -89,3 +90,20 @@ int getenv_verify (void)
char *s = getenv ("verify"); char *s = getenv ("verify");
return (s && (*s == 'n')) ? 0 : 1; return (s && (*s == 'n')) ? 0 : 1;
} }
void memmove_wd (void *to, void *from, size_t len, ulong chunksz)
{
#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
while (len > 0) {
size_t tail = (len > chunksz) ? chunksz : len;
WATCHDOG_RESET ();
memmove (to, from, tail);
to += tail;
from += tail;
len -= tail;
}
#else /* !(CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG) */
memmove (to, from, len);
#endif /* CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG */
}
#endif /* USE_HOSTCC */

3
include/image.h
View File

@ -250,8 +250,11 @@ static inline void image_set_name (image_header_t *hdr, const char *name)
int image_check_hcrc (image_header_t *hdr); int image_check_hcrc (image_header_t *hdr);
int image_check_dcrc (image_header_t *hdr); int image_check_dcrc (image_header_t *hdr);
#ifndef USE_HOSTCC
int image_check_dcrc_wd (image_header_t *hdr, ulong chunksize); int image_check_dcrc_wd (image_header_t *hdr, ulong chunksize);
int getenv_verify (void); int getenv_verify (void);
void memmove_wd (void *to, void *from, size_t len, ulong chunksz);
#endif
static inline int image_check_magic (image_header_t *hdr) static inline int image_check_magic (image_header_t *hdr)
{ {

21
lib_m68k/m68k_linux.c
View File

@ -266,25 +266,10 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
initrd_end = initrd_start + len; initrd_end = initrd_start + len;
printf(" Loading Ramdisk to %08lx, end %08lx ... ", printf(" Loading Ramdisk to %08lx, end %08lx ... ",
initrd_start, initrd_end); initrd_start, initrd_end);
#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
{
size_t l = len;
void *to = (void *)initrd_start;
void *from = (void *)data;
while (l > 0) { memmove_wd((void *)initrd_start,
size_t tail = (void *)data, len, CHUNKSZ);
(l > CHUNKSZ) ? CHUNKSZ : l;
WATCHDOG_RESET();
memmove(to, from, tail);
to += tail;
from += tail;
l -= tail;
}
}
#else /* !(CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG) */
memmove((void *)initrd_start, (void *)data, len);
#endif /* CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG */
puts("OK\n"); puts("OK\n");
} }
} else { } else {

20
lib_ppc/ppc_linux.c
View File

@ -426,24 +426,10 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
initrd_end = initrd_start + len; initrd_end = initrd_start + len;
printf (" Loading Ramdisk to %08lx, end %08lx ... ", printf (" Loading Ramdisk to %08lx, end %08lx ... ",
initrd_start, initrd_end); initrd_start, initrd_end);
#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
{
size_t l = len;
void *to = (void *)initrd_start;
void *from = (void *)data;
while (l > 0) { memmove_wd((void *)initrd_start,
size_t tail = (l > CHUNKSZ) ? CHUNKSZ : l; (void *)data, len, CHUNKSZ);
WATCHDOG_RESET();
memmove (to, from, tail);
to += tail;
from += tail;
l -= tail;
}
}
#else /* !(CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG) */
memmove ((void *)initrd_start, (void *)data, len);
#endif /* CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG */
puts ("OK\n"); puts ("OK\n");
} }
} else { } else {