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

[u-boot] / arch / arm / mach-mvebu / arm64-common.c

diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c
index 8f026559c2f94d02dda4d531ddd7fcfc0668863b..1c0477a3cacd273d4b8e10f1f768a9aa17082c90 100644 (file)
--- a/arch/arm/mach-mvebu/arm64-common.c
+++ b/arch/arm/mach-mvebu/arm64-common.c
@@ -82,7 +82,7 @@ int dram_init(void)
        return 0;
 }
 
-void dram_init_banksize(void)
+int dram_init_banksize(void)
 {
        const void *fdt = gd->fdt_blob;
        const fdt32_t *val;
@@ -90,13 +90,13 @@ void dram_init_banksize(void)
 
        val = get_memory_reg_prop(fdt, &len);
        if (len < 0)
-               return;
+               return -ENXIO;
 
        ac = fdt_address_cells(fdt, 0);
        sc = fdt_size_cells(fdt, 0);
        if (ac < 1 || sc > 2 || sc < 1 || sc > 2) {
                printf("invalid address/size cells\n");
-               return;
+               return -ENXIO;
        }
 
        cells = ac + sc;
@@ -114,6 +114,8 @@ void dram_init_banksize(void)
                      i, (unsigned long)gd->bd->bi_dram[i].start,
                      (unsigned long)gd->bd->bi_dram[i].size);
        }
+
+       return 0;
 }
 
 int arch_cpu_init(void)