Wolfgang

Here is the update for do_bootm_linux(). There is a compile error if WATCHDOG is defined.

Thanks,

Regards, TsiChung

From dc862f8c45dbfb99f86a4b0c3165a03d2ead9047 Mon Sep 17 00:00:00 2001

From: TsiChungLiew Tsi-Chung.Liew@freescale.com Date: Wed, 17 Oct 2007 15:18:39 -0500 Subject: [PATCH] ColdFire: Fixed do_bootm_linux() if watchdog is defined

Signed-off-by: TsiChungLiew Tsi-Chung.Liew@freescale.com --- lib_m68k/m68k_linux.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/lib_m68k/m68k_linux.c b/lib_m68k/m68k_linux.c index bea9744..43cc8fa 100644 --- a/lib_m68k/m68k_linux.c +++ b/lib_m68k/m68k_linux.c @@ -27,6 +27,7 @@ #include <zlib.h> #include <bzlib.h> #include <environment.h> +#include <watchdog.h> #include <asm/byteorder.h>

DECLARE_GLOBAL_DATA_PTR; @@ -36,6 +37,8 @@ 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)