From: Marian Balakowicz Date: Tue, 8 Jan 2008 17:11:44 +0000 (+0100) Subject: [new uImage] Move CHUNKSZ definition to image.h X-Git-Tag: v1.3.3-rc1~141^2^2~83 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=559316faf7eae0614c91d77f509b57d6c4c091ba;p=u-boot [new uImage] Move CHUNKSZ definition to image.h CHUNKSZ defined for PPC and M68K is set to the same value of 64K, move this definition to a common header. Signed-off-by: Marian Balakowicz --- diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 67f555e1de..fbe81d3039 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -61,13 +61,6 @@ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); #include #endif -/* - * Some systems (for example LWMON) have very short watchdog periods; - * we must make sure to split long operations like memmove() or - * crc32() into reasonable chunks. - */ -#define CHUNKSZ (64 * 1024) - int gunzip (void *, int, unsigned char *, unsigned long *); #ifdef CONFIG_BZIP2 diff --git a/include/image.h b/include/image.h index c9f42980e8..aab3f44ccb 100644 --- a/include/image.h +++ b/include/image.h @@ -164,6 +164,13 @@ typedef struct image_header { uint8_t ih_name[IH_NMLEN]; /* Image Name */ } image_header_t; +/* + * Some systems (for example LWMON) have very short watchdog periods; + * we must make sure to split long operations like memmove() or + * crc32() into reasonable chunks. + */ +#define CHUNKSZ (64 * 1024) + #define image_to_cpu(x) ntohl(x) #define cpu_to_image(x) htonl(x) diff --git a/lib_m68k/m68k_linux.c b/lib_m68k/m68k_linux.c index 3759fd2d35..f865c0c6a5 100644 --- a/lib_m68k/m68k_linux.c +++ b/lib_m68k/m68k_linux.c @@ -37,8 +37,6 @@ DECLARE_GLOBAL_DATA_PTR; #define LINUX_MAX_ENVS 256 #define LINUX_MAX_ARGS 256 -#define CHUNKSZ (64 * 1024) - #ifdef CONFIG_SHOW_BOOT_PROGRESS # include # define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg) diff --git a/lib_ppc/ppc_linux.c b/lib_ppc/ppc_linux.c index 94872a61dc..4e7734ccd3 100644 --- a/lib_ppc/ppc_linux.c +++ b/lib_ppc/ppc_linux.c @@ -49,8 +49,6 @@ #include #endif -#define CHUNKSZ (64 * 1024) - DECLARE_GLOBAL_DATA_PTR; extern image_header_t header;