yair/u-boot-tk1-som
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-socfpga

Browse Source
This commit is contained in:
Tom Rini
2016-06-02 21:42:23 -04:00
parent e2924e5904 d31e9c575f
commit edb697cfcc
22 changed files with 1853 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/spl/spl.c
View File

@@ -489,9 +489,6 @@ ulong spl_relocate_stack_gd(void)
#ifdef CONFIG_SPL_SYS_MALLOC_SIMPLE
if (CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN) {
if (!(gd->flags & GD_FLG_SPL_INIT))
panic_str("spl_init must be called before heap reloc");
ptr -= CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN;
gd->malloc_base = ptr;
gd->malloc_limit = CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN;