Fix merge problems

[platform/kernel/u-boot.git] / board / ids8247 / ids8247.c

diff --git a/board/ids8247/ids8247.c b/board/ids8247/ids8247.c
index 7176770..065014a 100644 (file)
--- a/board/ids8247/ids8247.c
+++ b/board/ids8247/ids8247.c
@@ -276,7 +276,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
        return (size);
 }
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        volatile immap_t *immap = (immap_t *) CFG_IMMR;
        volatile memctl8260_t *memctl = &immap->im_memctl;
@@ -321,7 +321,7 @@ nand_init (void)
        printf ("%4lu MB\n", totlen >>20);
 }
 
-#endif /* CFG_CMD_NAND */
+#endif /* CONFIG_CMD_NAND */
 
 #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
 /*
@@ -334,7 +334,7 @@ void ft_blob_update(void *blob, bd_t *bd)
        ret = fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
 
        if (ret < 0) {
-               printf("ft_blob_update): cannot set /memory/reg "
+               printf("ft_blob_update(): cannot set /memory/reg "
                        "property err:%s\n", fdt_strerror(ret));
        }
 }