video: ipu: initialize g_ipu_clk, g_ldb_clk statically

[karo-tx-uboot.git] / common / image-fdt.c

diff --git a/common/image-fdt.c b/common/image-fdt.c
index d9e47283c716c4d47b709e1390a78dd376f95b08..5180a03a61bfdeed9014b651bf83a4cb9ee0b4dc 100644 (file)
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <image.h>
 #include <libfdt.h>
+#include <mapmem.h>
 #include <asm/io.h>
 
 #ifndef CONFIG_SYS_FDT_PAD
@@ -470,6 +471,10 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
        int ret = -EPERM;
        int fdt_ret;
 
+       if (fdt_root(blob) < 0) {
+               printf("ERROR: root node setup failed\n");
+               goto err;
+       }
        if (fdt_chosen(blob) < 0) {
                printf("ERROR: /chosen node create failed\n");
                goto err;
@@ -487,7 +492,8 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
                }
        }
        if (IMAGE_OF_SYSTEM_SETUP) {
-               if (ft_system_setup(blob, gd->bd)) {
+               fdt_ret = ft_system_setup(blob, gd->bd);
+               if (fdt_ret) {
                        printf("ERROR: system-specific fdt fixup failed: %s\n",
                               fdt_strerror(fdt_ret));
                        goto err;