Merge branch 'master' of git://git.denx.de/u-boot-arm

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

diff --git a/common/image-fdt.c b/common/image-fdt.c
index 2e22cca54e15d00d2d1aa804c63bb46b7cf68701..5d64009df7d5bf49f70d990b7e3390313aac0acb 100644 (file)
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -55,7 +55,7 @@ static const image_header_t *image_get_fdt(ulong fdt_addr)
                fdt_error("uImage is compressed");
                return NULL;
        }
-       if (fdt_check_header((char *)image_get_data(fdt_hdr)) != 0) {
+       if (fdt_check_header((void *)image_get_data(fdt_hdr)) != 0) {
                fdt_error("uImage data is not a fdt");
                return NULL;
        }
@@ -463,7 +463,7 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
                return -1;
        }
        arch_fixup_memory_node(blob);
-       if (IMAAGE_OF_BOARD_SETUP)
+       if (IMAGE_OF_BOARD_SETUP)
                ft_board_setup(blob, gd->bd);
        fdt_fixup_ethernet(blob);
 
@@ -487,5 +487,10 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
        if (!ft_verify_fdt(blob))
                return -1;
 
+#ifdef CONFIG_SOC_K2HK
+       if (IMAGE_OF_BOARD_SETUP)
+               ft_board_setup_ex(blob, gd->bd);
+#endif
+
        return 0;
 }