diff options
| author | Pali Rohár <pali@kernel.org> | 2021-07-23 12:14:33 +0300 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2021-07-31 10:59:58 +0300 |
| commit | 40afc069b3a30e2ee785aee28f86dc0c10463ce0 (patch) | |
| tree | 422e635dfa0fb68ca2bea5a1d0ee7a22dd24aae8 /board/gdsys | |
| parent | 2a85fdad3e61ff71b1c3acc97e045f390a7263b0 (diff) | |
| download | u-boot-40afc069b3a30e2ee785aee28f86dc0c10463ce0.tar.xz | |
arm: mvebu: gdsys: Remove custom spl_board_init()
The gdsys a38x config file (controlcenterdc_defconfig) uses BootROM to
load U-Boot proper.
Since it is now possible to do this via U-Boot SPL framework, we do not
need to provide custom spl_board_init() which calls return_to_bootrom().
Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board/gdsys')
| -rw-r--r-- | board/gdsys/a38x/Makefile | 2 | ||||
| -rw-r--r-- | board/gdsys/a38x/spl.c | 20 |
2 files changed, 1 insertions, 21 deletions
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@gdsys.cc> # Copyright (C) 2016 Mario Six <mario.six@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@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 -} |