diff options
| author | Simon Glass <sjg@chromium.org> | 2017-03-31 08:40:25 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-05 13:59:20 -0400 |
| commit | 088454cde245b4d431ce0181be8b3cbceea059d6 (patch) | |
| tree | ec86ebe66961c9b06ab4b39ec83fd81d4a86e9be /board/imgtec | |
| parent | 52c411805c090999f015df8bdf8016fb684746d0 (diff) | |
| download | u-boot-088454cde245b4d431ce0181be8b3cbceea059d6.tar.gz | |
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>
Diffstat (limited to 'board/imgtec')
| -rw-r--r-- | board/imgtec/boston/ddr.c | 9 | ||||
| -rw-r--r-- | board/imgtec/malta/malta.c | 8 | ||||
| -rw-r--r-- | board/imgtec/xilfpga/xilfpga.c | 8 |
3 files changed, 19 insertions, 6 deletions
diff --git a/board/imgtec/boston/ddr.c b/board/imgtec/boston/ddr.c index c841bf02a3..b92ff2aa88 100644 --- a/board/imgtec/boston/ddr.c +++ b/board/imgtec/boston/ddr.c @@ -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) diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c index c269d0a5a3..f8c65b0e46 100644 --- a/board/imgtec/malta/malta.c +++ b/board/imgtec/malta/malta.c @@ -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) diff --git a/board/imgtec/xilfpga/xilfpga.c b/board/imgtec/xilfpga/xilfpga.c index dc0a088ecb..8aa7c10bff 100644 --- a/board/imgtec/xilfpga/xilfpga.c +++ b/board/imgtec/xilfpga/xilfpga.c @@ -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; } |