diff options
| author | Marek Vasut <marex@denx.de> | 2016-05-30 17:10:53 +0200 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2016-06-01 22:44:14 +0200 |
| commit | 1254667689a5a4accc149fef6ff69da760001b2b (patch) | |
| tree | 30571ee02beeabcbe418a06fd3d22028ccc792af | |
| parent | 569a191a864cee66e3d0763179e8688499de0377 (diff) | |
| download | u-boot-imx-1254667689a5a4accc149fef6ff69da760001b2b.zip u-boot-imx-1254667689a5a4accc149fef6ff69da760001b2b.tar.gz u-boot-imx-1254667689a5a4accc149fef6ff69da760001b2b.tar.bz2 | |
spl: Remove bogus GD_FLG_SPL_INIT check
Remove the check for GD_FLG_SPL_INIT in spl_relocate_stack_gd().
The check will always fail. This is because spl_relocate_stack_gd()
is called from ARM's crt0.S and it is called before board_init_r().
The board_init_r() calls spl_init(), which sets the GD_FLG_SPL_INIT
flag.
Note that reserving the malloc area in RAM is not a problem even
if the GD_FLG_SPL_INIT flag is not set.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Stephen Warren <swarren@nvidia.com>
| -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 bdde716..8b10bdf 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -486,9 +486,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; |