board_f: Drop return value from initdram()

At present we cannot use this function as an init sequence call without a
wrapper, since it returns the RAM size. Adjust it to set the RAM size in
global_data instead, and return 0 on success.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Simon Glass
2017-03-31 08:40:25 -06:00
committed by Tom Rini
parent 52c411805c
commit 088454cde2
136 changed files with 631 additions and 304 deletions

View File

@@ -10,11 +10,16 @@
#include "boston-regs.h"
phys_size_t initdram(void)
DECLARE_GLOBAL_DATA_PTR;
int initdram(void)
{
u32 ddrconf0 = __raw_readl((uint32_t *)BOSTON_PLAT_DDRCONF0);
return (phys_size_t)(ddrconf0 & BOSTON_PLAT_DDRCONF0_SIZE) << 30;
gd->ram_size = (phys_size_t)(ddrconf0 & BOSTON_PLAT_DDRCONF0_SIZE) <<
30;
return 0;
}
ulong board_get_usable_ram_top(ulong total_size)

View File

@@ -19,6 +19,8 @@
#include "superio.h"
DECLARE_GLOBAL_DATA_PTR;
enum core_card {
CORE_UNKNOWN,
CORE_LV,
@@ -83,9 +85,11 @@ static enum sys_con malta_sys_con(void)
}
}
phys_size_t initdram(void)
int initdram(void)
{
return CONFIG_SYS_MEM_SIZE;
gd->ram_size = CONFIG_SYS_MEM_SIZE;
return 0;
}
int checkboard(void)

View File

@@ -11,10 +11,14 @@
#include <common.h>
DECLARE_GLOBAL_DATA_PTR;
/* initialize the DDR Controller and PHY */
phys_size_t initdram(void)
int initdram(void)
{
/* MIG IP block is smart and doesn't need SW
* to do any init */
return CONFIG_SYS_SDRAM_SIZE; /* in bytes */
gd->ram_size = CONFIG_SYS_SDRAM_SIZE; /* in bytes */
return 0;
}