Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-09 03:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'next'

Browse source 
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2023-01-09 11:30:08 -05:00
commit cebdfc22da
2483 changed files with 62769 additions and 32768 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/memsize.c
View file

@ -108,11 +108,11 @@ phys_size_t __weak get_effective_memsize(void)
ram_size = ((phys_size_t)~0xfffULL) - gd->ram_base;
#endif
#ifndef CONFIG_MAX_MEM_MAPPED
#ifndef CFG_MAX_MEM_MAPPED
return ram_size;
#else
/* limit stack to what we can reasonable map */
return ((ram_size > CONFIG_MAX_MEM_MAPPED) ?
CONFIG_MAX_MEM_MAPPED : ram_size);
return ((ram_size > CFG_MAX_MEM_MAPPED) ?
CFG_MAX_MEM_MAPPED : ram_size);
#endif
}