On Tue, Apr 10, 2018 at 04:45:36PM -0700, Andrey Smirnov wrote:
> Avoid calling arm_mem_barebox_image() twice by making barebox_base
> function-wide in scope
>
> Signed-off-by: Andrey Smirnov <andrew.smirnov@xxxxxxxxx>
> ---
> arch/arm/cpu/start.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
> index 68fff892e..64bd942ad 100644
> --- a/arch/arm/cpu/start.c
> +++ b/arch/arm/cpu/start.c
> @@ -144,13 +144,11 @@ __noreturn void barebox_non_pbl_start(unsigned long membase,
> unsigned long endmem = membase + memsize;
> unsigned long malloc_start, malloc_end;
> unsigned long barebox_size = barebox_image_size + MAX_BSS_SIZE;
> -
> - if (IS_ENABLED(CONFIG_RELOCATABLE)) {
> - unsigned long barebox_base = arm_mem_barebox_image(membase,
> - endmem,
> - barebox_size);
> + unsigned long barebox_base = arm_mem_barebox_image(membase,
> + endmem,
> + barebox_size);
> + if (IS_ENABLED(CONFIG_RELOCATABLE))
> relocate_to_adr(barebox_base);
> - }
>
> setup_c();
>
> @@ -160,8 +158,7 @@ __noreturn void barebox_non_pbl_start(unsigned long membase,
>
> arm_stack_top = arm_mem_stack_top(membase, endmem);
> arm_barebox_size = barebox_size;
> - malloc_end = arm_mem_barebox_image(membase, endmem,
> - arm_barebox_size);
> + malloc_end = barebox_base;
>
> if (IS_ENABLED(CONFIG_MMU_EARLY)) {
> unsigned long ttb = arm_mem_ttb(membase, endmem);
> --
> 2.14.3
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
