mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-10-03 11:41:38 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

arm: mvebu: turris_omnia: refactor more code

Browse Source 
Refactor RAM size reading from EEPROM in preparation for next patch.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Marek Behún 2019-05-02 16:53:33 +02:00 committed by Stefan Roese
parent 6b26f3e312
commit f98169c55e
1 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
board/CZ.NIC/turris_omnia/turris_omnia.c
View File

@ -236,6 +236,31 @@ static bool omnia_read_eeprom(struct omnia_eeprom *oep)
return true; return true;
} }
static int omnia_get_ram_size_gb(void)
{
static int ram_size;
struct omnia_eeprom oep;
if (!ram_size) {
/* Get the board config from EEPROM */
if (omnia_read_eeprom(&oep)) {
debug("Memory config in EEPROM: 0x%02x\n", oep.ramsize);
if (oep.ramsize == 0x2)
ram_size = 2;
else
ram_size = 1;
} else {
/* Hardcoded fallback */
puts("Memory config from EEPROM read failed!\n");
puts("Falling back to default 1 GiB!\n");
ram_size = 1;
}
}
return ram_size;
}
/* /*
* Define the DDR layout / topology here in the board file. This will * Define the DDR layout / topology here in the board file. This will
* be used by the DDR3 init code in the SPL U-Boot version to configure * be used by the DDR3 init code in the SPL U-Boot version to configure
@ -287,37 +312,10 @@ static struct mv_ddr_topology_map board_topology_map_2g = {
struct mv_ddr_topology_map *mv_ddr_topology_map_get(void) struct mv_ddr_topology_map *mv_ddr_topology_map_get(void)
{ {
static int mem; if (omnia_get_ram_size_gb() == 2)
struct omnia_eeprom oep;
/* Get the board config from EEPROM */
if (!mem) {
if (!omnia_read_eeprom(&oep))
goto out;
printf("Memory config in EEPROM: 0x%02x\n", oep.ramsize);
if (oep.ramsize == 0x2)
mem = 2;
else
mem = 1;
}
out:
/* Hardcoded fallback */
if (mem == 0) {
puts("WARNING: Memory config from EEPROM read failed.\n");
puts("Falling back to default 1GiB map.\n");
mem = 1;
}
/* Return the board topology as defined in the board code */
if (mem == 1)
return &board_topology_map_1g;
if (mem == 2)
return &board_topology_map_2g; return &board_topology_map_2g;
else
return &board_topology_map_1g; return &board_topology_map_1g;
} }
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD