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 m8@semihalf.com ---
common/cmd_bootm.c | 7 ------- include/image.h | 7 +++++++ lib_m68k/m68k_linux.c | 2 -- lib_ppc/ppc_linux.c | 2 -- 4 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 76ea49f..4b2ea3f 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 <dataflash.h> #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 b4ba2de..00a4549 100644 --- a/include/image.h +++ b/include/image.h @@ -163,6 +163,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 6c2a6b2..237cd82 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 <status_led.h> # define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg) diff --git a/lib_ppc/ppc_linux.c b/lib_ppc/ppc_linux.c index 3a4b74f..1013f9e 100644 --- a/lib_ppc/ppc_linux.c +++ b/lib_ppc/ppc_linux.c @@ -49,8 +49,6 @@ #include <asm/cache.h> #endif
-#define CHUNKSZ (64 * 1024) - DECLARE_GLOBAL_DATA_PTR; extern image_header_t header;