diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-02 21:42:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-02 21:42:23 -0400 |
| commit | edb697cfcc2dda02c5b2a34b3157b8fa8fc01264 (patch) | |
| tree | 347dadd1492b3dd4935532a11fe9e2d77b114266 /common | |
| parent | e2924e5904ae413e0b4a2a0d407267e7bbc2c7c4 (diff) | |
| parent | d31e9c575f24f4b7f5f382ccae70d7a86bbc379d (diff) | |
| download | u-boot-imx-edb697cfcc2dda02c5b2a34b3157b8fa8fc01264.zip u-boot-imx-edb697cfcc2dda02c5b2a34b3157b8fa8fc01264.tar.gz u-boot-imx-edb697cfcc2dda02c5b2a34b3157b8fa8fc01264.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 780c081..c8dfc14 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -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; |