summaryrefslogtreecommitdiff
path: root/arch/x86/lib
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-03-31 14:40:32 (GMT)
committerTom Rini <trini@konsulko.com>2017-04-05 20:36:51 (GMT)
commit76b00aca4f1c13bc8f91a539e612abc70d0c692f (patch)
tree35f0e984413ef3d44ff50c53e8adc418f10b40e2 /arch/x86/lib
parentabf7f4c7040b3914bea327243dcfac0ef840fbaf (diff)
downloadu-boot-fsl-qoriq-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/x86/lib')
-rw-r--r--arch/x86/lib/efi/efi.c6
-rw-r--r--arch/x86/lib/fsp/fsp_dram.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/arch/x86/lib/efi/efi.c b/arch/x86/lib/efi/efi.c
index 533318b..b1746fa 100644
--- a/arch/x86/lib/efi/efi.c
+++ b/arch/x86/lib/efi/efi.c
@@ -92,7 +92,7 @@ int dram_init(void)
return 0;
}
-void dram_init_banksize(void)
+int dram_init_banksize(void)
{
struct efi_mem_desc *desc, *end;
struct efi_entry_memmap *map;
@@ -103,7 +103,7 @@ void dram_init_banksize(void)
if (ret) {
/* We should have stopped in dram_init(), something is wrong */
debug("%s: Missing memory map\n", __func__);
- return;
+ return -ENXIO;
}
end = (struct efi_mem_desc *)((ulong)map + size);
desc = map->desc;
@@ -123,6 +123,8 @@ void dram_init_banksize(void)
EFI_PAGE_SHIFT;
num_banks++;
}
+
+ return 0;
}
int checkcpu(void)
diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c
index fcfe693..8b880cd 100644
--- a/arch/x86/lib/fsp/fsp_dram.c
+++ b/arch/x86/lib/fsp/fsp_dram.c
@@ -41,10 +41,12 @@ int dram_init(void)
return 0;
}
-void dram_init_banksize(void)
+int dram_init_banksize(void)
{
gd->bd->bi_dram[0].start = 0;
gd->bd->bi_dram[0].size = gd->ram_size;
+
+ return 0;
}
/*