diff options
| author | Simon Glass <sjg@chromium.org> | 2017-03-31 14:40:32 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-05 20:36:51 (GMT) |
| commit | 76b00aca4f1c13bc8f91a539e612abc70d0c692f (patch) | |
| tree | 35f0e984413ef3d44ff50c53e8adc418f10b40e2 /arch/arm/mach-mvebu | |
| parent | abf7f4c7040b3914bea327243dcfac0ef840fbaf (diff) | |
| download | u-boot-76b00aca4f1c13bc8f91a539e612abc70d0c692f.tar.xz | |
board_f: Drop setup_dram_config() wrapper
By making dram_init_banksize() return an error code we can drop the
wrapper. Adjust this and clean up all implementations.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'arch/arm/mach-mvebu')
| -rw-r--r-- | arch/arm/mach-mvebu/arm64-common.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/dram.c | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index 8f02655..1c0477a 100644 --- 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) diff --git a/arch/arm/mach-mvebu/dram.c b/arch/arm/mach-mvebu/dram.c index a8ec5ea..e3f304c 100644 --- a/arch/arm/mach-mvebu/dram.c +++ b/arch/arm/mach-mvebu/dram.c @@ -273,7 +273,7 @@ int dram_init(void) * If this function is not defined here, * board.c alters dram bank zero configuration defined above. */ -void dram_init_banksize(void) +int dram_init_banksize(void) { u64 size = 0; int i; @@ -287,6 +287,8 @@ void dram_init_banksize(void) if (size > SDRAM_SIZE_MAX) mvebu_sdram_bs_set(i, 0x40000000); } + + return 0; } #if defined(CONFIG_ARCH_MVEBU) |