rtc: Fix merging problem

[u-boot] / lib_m68k / m68k_linux.c

diff --git a/lib_m68k/m68k_linux.c b/lib_m68k/m68k_linux.c
index fde1744e45cfc1e59fcec569fb0346969221f957..cc974c2d60d7dfb4f5f8aa28f47a54b01ff50e9e 100644 (file)
--- a/lib_m68k/m68k_linux.c
+++ b/lib_m68k/m68k_linux.c
@@ -26,6 +26,7 @@
 #include <image.h>
 #include <zlib.h>
 #include <bzlib.h>
+#include <watchdog.h>
 #include <environment.h>
 #include <asm/byteorder.h>
 
@@ -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)
@@ -92,7 +95,8 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
         */
        asm("movel %%a7, %%d0\n"
            "movel %%d0, %0\n": "=d"(sp): :"%d0");
-       \rdebug("## Current stack ends at 0x%08lX ", sp);
+
+       debug("## Current stack ends at 0x%08lX ", sp);
 
        sp -= 2048;             /* just to be sure */
        if (sp > CFG_BOOTMAPSZ)
@@ -269,7 +273,8 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
                                 */
                                asm("movel %%a7, %%d0\n"
                                    "movel %%d0, %0\n": "=d"(nsp): :"%d0");
-                               \r                               nsp -= 2048;    /* just to be sure */
+
+                               nsp -= 2048;    /* just to be sure */
                                nsp &= ~0xF;
 
                                if (nsp > initrd_high)  /* limit as specified */