brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

ARM: uniphier: make dram_init() more generic

Browse Source 
Make this function work with any channel being empty.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2019-07-10 20:07:44 +09:00
parent 6f47c99423
commit df72534121
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mach-uniphier/dram_init.c
View File

@ -212,6 +212,8 @@ static int uniphier_dram_map_get(struct uniphier_dram_map *dram_map)
int dram_init(void)
{
struct uniphier_dram_map dram_map[3] = {};
bool valid_bank_found = false;
unsigned long prev_top;
int ret, i;
gd->ram_size = 0;
@ -224,15 +226,14 @@ int dram_init(void)
unsigned long max_size;
if (!dram_map[i].size)
break;
continue;
/*
* U-Boot relocates itself to the tail of the memory region,
* but it does not expect sparse memory. We use the first
* contiguous chunk here.
*/
if (i > 0 && dram_map[i - 1].base + dram_map[i - 1].size <
dram_map[i].base)
if (valid_bank_found && prev_top < dram_map[i].base)
break;
/*
@ -252,6 +253,9 @@ int dram_init(void)
}
gd->ram_size += dram_map[i].size;
prev_top = dram_map[i].base + dram_map[i].size;
valid_bank_found = true;
}
/*