diff options
Diffstat (limited to 'common/spl/spl.c')
| -rw-r--r-- | common/spl/spl.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 462c3a2..766fb3d 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -167,14 +167,6 @@ __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) (image_entry_noargs_t)spl_image->entry_point; debug("image entry point: 0x%lX\n", spl_image->entry_point); -#if defined(CONFIG_ARMV8_SPIN_TABLE) && defined(CONFIG_ARMV8_MULTIENTRY) - /* - * Release all slave cores from CPU_RELEASE_ADDR so they could - * arrive to the spin-table code in start.S of the u-boot - */ - *(ulong *)CPU_RELEASE_ADDR = (ulong)spl_image->entry_point; -#endif - image_entry(); } @@ -183,7 +175,12 @@ int spl_init(void) int ret; debug("spl_init()\n"); -#if defined(CONFIG_SYS_MALLOC_F_LEN) +/* + * with CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN we set malloc_base and + * malloc_limit in spl_relocate_stack_gd + */ +#if defined(CONFIG_SYS_MALLOC_F_LEN) && \ + !defined(CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN) #ifdef CONFIG_MALLOC_F_ADDR gd->malloc_base = CONFIG_MALLOC_F_ADDR; #endif |