X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=lib_ppc%2Fbootm.c;h=0685a9331cba9fa7918b309b8c004709308c4436;hb=95da7841960723734518380aec64a062ebc4fb0d;hp=a436f75abad32a2ce23f0d3c535d4b7e1c2806fc;hpb=2e4dcb64d1c6bc0bcab2432d41b0185e0eb942ae;p=u-boot

diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
index a436f75aba..0685a9331c 100644
--- a/lib_ppc/bootm.c
+++ b/lib_ppc/bootm.c
@@ -29,7 +29,7 @@
 #include <command.h>
 #include <image.h>
 #include <malloc.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <environment.h>
 #include <asm/byteorder.h>
@@ -94,6 +94,7 @@ static void boot_jump_linux(bootm_headers_t *images)
 #endif
 
 		debug ("   Booting using OF flat tree...\n");
+		WATCHDOG_RESET ();
 		(*kernel) ((bd_t *)of_flat_tree, 0, 0, EPAPR_MAGIC,
 			   CONFIG_SYS_BOOTMAPSZ, 0, 0);
 		/* does not return */
@@ -117,6 +118,7 @@ static void boot_jump_linux(bootm_headers_t *images)
 		bd_t *kbd = images->kbd;
 
 		debug ("   Booting using board info...\n");
+		WATCHDOG_RESET ();
 		(*kernel) (kbd, initrd_start, initrd_end,
 			   cmd_start, cmd_end, 0, 0);
 		/* does not return */
@@ -170,7 +172,7 @@ void arch_lmb_reserve(struct lmb *lmb)
 
 static void boot_prep_linux(void)
 {
-#if (CONFIG_NUM_CPUS > 1)
+#ifdef CONFIG_MP
 	/* if we are MP make sure to flush the dcache() to any changes are made
 	 * visibile to all other cores */
 	flush_dcache();
@@ -224,12 +226,13 @@ static int boot_bd_t_linux(bootm_headers_t *images)
 
 static int boot_body_linux(bootm_headers_t *images)
 {
-	ulong rd_len, bootmap_base = getenv_bootm_low();
-	ulong of_size = images->ft_len;
+	ulong rd_len;
 	struct lmb *lmb = &images->lmb;
 	ulong *initrd_start = &images->initrd_start;
 	ulong *initrd_end = &images->initrd_end;
 #if defined(CONFIG_OF_LIBFDT)
+	ulong bootmap_base = getenv_bootm_low();
+	ulong of_size = images->ft_len;
 	char **of_flat_tree = &images->ft_addr;
 #endif