mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-17 10:18:38 +00:00
abbf2179b2
Current code uses hack in board_init_f() which calls return_to_bootrom() to skip U-Boot SPL code and return back to BootROM to load U-Boot via UART or from NAND. This change migrates that hack from the board_init_f() function and changes it to return BOOT_DEVICE_BOOTROM instead of returning to BootROM directly, so that U-Boot's SPL framework is used for returning to BootROM. Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Marek Behún <marek.behun@nic.cz> Reviewed-by: Stefan Roese <sr@denx.de> Reviewed-by: Chris Packham <judge.packham@gmail.com> Tested-by: Chris Packham <judge.packham@gmail.com>
173 lines
4.1 KiB
C
173 lines
4.1 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2014-2016 Stefan Roese <sr@denx.de>
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <dm.h>
|
|
#include <debug_uart.h>
|
|
#include <fdtdec.h>
|
|
#include <hang.h>
|
|
#include <init.h>
|
|
#include <log.h>
|
|
#include <spl.h>
|
|
#include <asm/global_data.h>
|
|
#include <asm/io.h>
|
|
#include <asm/arch/cpu.h>
|
|
#include <asm/arch/soc.h>
|
|
|
|
static u32 get_boot_device(void)
|
|
{
|
|
u32 val;
|
|
u32 boot_device;
|
|
|
|
/*
|
|
* First check, if UART boot-mode is active. This can only
|
|
* be done, via the bootrom error register. Here the
|
|
* MSB marks if the UART mode is active.
|
|
*/
|
|
val = readl(CONFIG_BOOTROM_ERR_REG);
|
|
boot_device = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
|
|
debug("BOOTROM_REG=0x%08x boot_device=0x%x\n", val, boot_device);
|
|
if (boot_device == BOOTROM_ERR_MODE_UART)
|
|
return BOOT_DEVICE_UART;
|
|
|
|
#ifdef CONFIG_ARMADA_38X
|
|
/*
|
|
* If the bootrom error code contains any other than zeros it's an
|
|
* error condition and the bootROM has fallen back to UART boot
|
|
*/
|
|
boot_device = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
|
|
if (boot_device)
|
|
return BOOT_DEVICE_UART;
|
|
#endif
|
|
|
|
/*
|
|
* Now check the SAR register for the strapped boot-device
|
|
*/
|
|
val = readl(CONFIG_SAR_REG); /* SAR - Sample At Reset */
|
|
boot_device = (val & BOOT_DEV_SEL_MASK) >> BOOT_DEV_SEL_OFFS;
|
|
debug("SAR_REG=0x%08x boot_device=0x%x\n", val, boot_device);
|
|
switch (boot_device) {
|
|
#if defined(CONFIG_ARMADA_38X)
|
|
case BOOT_FROM_NAND:
|
|
return BOOT_DEVICE_NAND;
|
|
#endif
|
|
#ifdef CONFIG_SPL_MMC_SUPPORT
|
|
case BOOT_FROM_MMC:
|
|
case BOOT_FROM_MMC_ALT:
|
|
return BOOT_DEVICE_MMC1;
|
|
#endif
|
|
case BOOT_FROM_UART:
|
|
#ifdef BOOT_FROM_UART_ALT
|
|
case BOOT_FROM_UART_ALT:
|
|
#endif
|
|
return BOOT_DEVICE_UART;
|
|
#ifdef BOOT_FROM_SATA
|
|
case BOOT_FROM_SATA:
|
|
case BOOT_FROM_SATA_ALT:
|
|
return BOOT_DEVICE_SATA;
|
|
#endif
|
|
case BOOT_FROM_SPI:
|
|
default:
|
|
return BOOT_DEVICE_SPI;
|
|
};
|
|
}
|
|
|
|
u32 spl_boot_device(void)
|
|
{
|
|
u32 boot_device = get_boot_device();
|
|
|
|
/*
|
|
* Return to the BootROM to continue the Marvell xmodem
|
|
* UART boot protocol. As initiated by the kwboot tool.
|
|
*
|
|
* This can only be done by the BootROM since the beginning
|
|
* of the image is already read and interpreted by the BootROM.
|
|
* SPL has no chance to receive this information. So we
|
|
* need to return to the BootROM to enable this xmodem
|
|
* UART download. Use SPL infrastructure to return to BootROM.
|
|
*
|
|
* If booting from NAND lets let the BootROM load the
|
|
* rest of the bootloader.
|
|
*/
|
|
switch (boot_device) {
|
|
case BOOT_DEVICE_UART:
|
|
#if defined(CONFIG_ARMADA_38X)
|
|
case BOOT_DEVICE_NAND:
|
|
#endif
|
|
return BOOT_DEVICE_BOOTROM;
|
|
default:
|
|
return boot_device;
|
|
}
|
|
}
|
|
|
|
int board_return_to_bootrom(struct spl_image_info *spl_image,
|
|
struct spl_boot_device *bootdev)
|
|
{
|
|
u32 *regs = *(u32 **)CONFIG_SPL_BOOTROM_SAVE;
|
|
|
|
printf("Returning to BootROM (return address 0x%08x)...\n", regs[13]);
|
|
return_to_bootrom();
|
|
|
|
/* NOTREACHED - return_to_bootrom() does not return */
|
|
hang();
|
|
}
|
|
|
|
void board_init_f(ulong dummy)
|
|
{
|
|
int ret;
|
|
|
|
/*
|
|
* Pin muxing needs to be done before UART output, since
|
|
* on A38x the UART pins need some re-muxing for output
|
|
* to work.
|
|
*/
|
|
board_early_init_f();
|
|
|
|
/* Example code showing how to enable the debug UART on MVEBU */
|
|
#ifdef EARLY_UART
|
|
/*
|
|
* Debug UART can be used from here if required:
|
|
*
|
|
* debug_uart_init();
|
|
* printch('a');
|
|
* printhex8(0x1234);
|
|
* printascii("string");
|
|
*/
|
|
#endif
|
|
|
|
/*
|
|
* Use special translation offset for SPL. This needs to be
|
|
* configured *before* spl_init() is called as this function
|
|
* calls dm_init() which calls the bind functions of the
|
|
* device drivers. Here the base address needs to be configured
|
|
* (translated) correctly.
|
|
*/
|
|
gd->translation_offset = 0xd0000000 - 0xf1000000;
|
|
|
|
ret = spl_init();
|
|
if (ret) {
|
|
debug("spl_init() failed: %d\n", ret);
|
|
hang();
|
|
}
|
|
|
|
preloader_console_init();
|
|
|
|
timer_init();
|
|
|
|
/* Armada 375 does not support SerDes and DDR3 init yet */
|
|
#if !defined(CONFIG_ARMADA_375)
|
|
/* First init the serdes PHY's */
|
|
serdes_phy_config();
|
|
|
|
/* Setup DDR */
|
|
ddr3_init();
|
|
#endif
|
|
|
|
/* Initialize Auto Voltage Scaling */
|
|
mv_avs_init();
|
|
|
|
/* Update read timing control for PCIe */
|
|
mv_rtc_config();
|
|
}
|