cmd_dasa_sim.c: Fix GCC 4.6 build warnings

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

diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c
index e25a1137f18a18a9c9d2d62e96950a1d8b350355..f32be52108212477507b51b163fbe0563a0e7874 100644 (file)
--- a/arch/nios2/lib/bootm.c
+++ b/arch/nios2/lib/bootm.c
@@ -36,13 +36,11 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
        ulong initrd_end = images->rd_end;
        char *of_flat_tree = NULL;
 #if defined(CONFIG_OF_LIBFDT)
-       ulong of_size = 0;
-
-       /* find flattened device tree */
-       if (boot_get_fdt(flag, argc, argv, images, &of_flat_tree, &of_size))
-               return 1;
+       /* did generic code already find a device tree? */
+       if (images->ft_len)
+               of_flat_tree = images->ft_addr;
 #endif
-       if (!of_flat_tree)
+       if (!of_flat_tree && argc > 3)
                of_flat_tree = (char *)simple_strtoul(argv[3], NULL, 16);
        if (of_flat_tree)
                initrd_end = (ulong)of_flat_tree;