Dual-license IBM code contributions

[karo-tx-uboot.git] / lib_ppc / bootm.c

diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
index fce4effe859878adb2dfb8ec6ef805eaf708d940..0d702bf25178670c2689006d17083c6fa2452ee3 100644 (file)
--- 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>
@@ -173,7 +173,7 @@ static void boot_prep_linux(void)
 #if (CONFIG_NUM_CPUS > 1)
        /* if we are MP make sure to flush the dcache() to any changes are made
         * visibile to all other cores */
-        flush_dcache();
+       flush_dcache();
 #endif
        return ;
 }
@@ -224,12 +224,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