mpc83xx: fix pcie configuration space read/write

[u-boot] / arch / powerpc / lib / bootm.c

diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index 6702df51a583026d421a6275c5bea11b134d35b6..116d81bec6bf03baf0d53fb796f0960c840710e4 100644 (file)
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -47,7 +47,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 extern ulong get_effective_memsize(void);
 static ulong get_sp (void);
 static void set_clocks_in_mhz (bd_t *kbd);
@@ -253,7 +252,7 @@ static int boot_body_linux(bootm_headers_t *images)
        if (ret)
                return ret;
 
-#if defined(CONFIG_OF_LIBFDT)
+#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_SYS_BOOTMAPSZ)
        ret = boot_relocate_fdt(lmb, bootmap_base, of_flat_tree, &of_size);
        if (ret)
                return ret;
@@ -292,12 +291,12 @@ static int boot_body_linux(bootm_headers_t *images)
                if (*initrd_start && *initrd_end)
                        fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1);
        }
-#endif /* CONFIG_OF_LIBFDT */
+#endif /* CONFIG_OF_LIBFDT && CONFIG_SYS_BOOTMAPSZ */
        return 0;
 }
 
 __attribute__((noinline))
-int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
+int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images)
 {
        int     ret;