[PATCH u-boot-mvebu v2 39/41] arm: mvebu: gdsys: Remove custom spl_board_init()

[Stefan Roese]

Hi Mario,

On 19.07.21 14:21, Marek Behún wrote:
> From: Pali Rohár <pali at kernel.org>
> 
> Now it is possible to use BootROM to load and boot main U-Boot binary. It
> is just required to disable config option CONFIG_SPL_SPI_FLASH_SUPPORT.
> 
> gdsys a38x config file (controlcenterdc_defconfig) does not have that
> option enabled so there is no need to provide custom spl_board_init()
> function which calls return_to_bootrom().
> 
> Remove it.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>
> Reviewed-by: Marek Behún <marek.behun at nic.cz>
> Reviewed-by: Chris Packham <judge.packham at gmail.com>

Mario, could you please do some tests on your Marvell platforms with
this series?

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
>   board/gdsys/a38x/Makefile |  2 +-
>   board/gdsys/a38x/spl.c    | 20 --------------------
>   2 files changed, 1 insertion(+), 21 deletions(-)
>   delete mode 100644 board/gdsys/a38x/spl.c
> 
> diff --git a/board/gdsys/a38x/Makefile b/board/gdsys/a38x/Makefile
> index 32fffab467..4b13859fed 100644
> --- a/board/gdsys/a38x/Makefile
> +++ b/board/gdsys/a38x/Makefile
> @@ -4,7 +4,7 @@
>   # Copyright (C) 2015 Reinhard Pfau <reinhard.pfau at gdsys.cc>
>   # Copyright (C) 2016 Mario Six <mario.six at gdsys.cc>
>   
> -obj-$(CONFIG_TARGET_CONTROLCENTERDC) += controlcenterdc.o hre.o spl.o keyprogram.o dt_helpers.o
> +obj-$(CONFIG_TARGET_CONTROLCENTERDC) += controlcenterdc.o hre.o keyprogram.o dt_helpers.o
>   
>   ifeq ($(CONFIG_SPL_BUILD),)
>   obj-$(CONFIG_TARGET_CONTROLCENTERDC) += hydra.o ihs_phys.o
> diff --git a/board/gdsys/a38x/spl.c b/board/gdsys/a38x/spl.c
> deleted file mode 100644
> index 84864d1974..0000000000
> --- a/board/gdsys/a38x/spl.c
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0+
> -/*
> - * (C) Copyright 2016
> - * Mario Six, Guntermann & Drunck GmbH, mario.six at gdsys.cc
> - */
> -
> -#include <common.h>
> -#include <config.h>
> -#include <asm/arch/cpu.h>
> -
> -void spl_board_init(void)
> -{
> -#if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH
> -	u32 *bootrom_save = (u32 *)CONFIG_SPL_BOOTROM_SAVE;
> -	u32 *regs = (u32 *)(*bootrom_save);
> -
> -	printf("Returning to BootROM (return address %08x)...\n", regs[13]);
> -	return_to_bootrom();
> -#endif
> -}
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de