mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2025-09-08 23:41:50 +02:00
d678a59d2d
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"' I failed to notice that b4 noticed it was based on next and so took that as the base commit and merged that part of next to master. This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35. Reported-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Tom Rini <trini@konsulko.com>
110 lines
2.6 KiB
C
110 lines
2.6 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2011 OMICRON electronics GmbH
|
|
*
|
|
* based on drivers/mtd/nand/raw/nand_spl_load.c
|
|
*
|
|
* Copyright (C) 2011
|
|
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <image.h>
|
|
#include <imx_container.h>
|
|
#include <log.h>
|
|
#include <spi.h>
|
|
#include <spi_flash.h>
|
|
#include <errno.h>
|
|
#include <spl.h>
|
|
#include <spl_load.h>
|
|
#include <asm/global_data.h>
|
|
#include <asm/io.h>
|
|
#include <dm/ofnode.h>
|
|
|
|
static ulong spl_spi_fit_read(struct spl_load_info *load, ulong sector,
|
|
ulong count, void *buf)
|
|
{
|
|
struct spi_flash *flash = load->priv;
|
|
ulong ret;
|
|
|
|
ret = spi_flash_read(flash, sector, count, buf);
|
|
if (!ret)
|
|
return count;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
unsigned int __weak spl_spi_get_uboot_offs(struct spi_flash *flash)
|
|
{
|
|
return CONFIG_SYS_SPI_U_BOOT_OFFS;
|
|
}
|
|
|
|
u32 __weak spl_spi_boot_bus(void)
|
|
{
|
|
return CONFIG_SF_DEFAULT_BUS;
|
|
}
|
|
|
|
u32 __weak spl_spi_boot_cs(void)
|
|
{
|
|
return CONFIG_SF_DEFAULT_CS;
|
|
}
|
|
|
|
/*
|
|
* The main entry for SPI booting. It's necessary that SDRAM is already
|
|
* configured and available since this code loads the main U-Boot image
|
|
* from SPI into SDRAM and starts it from there.
|
|
*/
|
|
static int spl_spi_load_image(struct spl_image_info *spl_image,
|
|
struct spl_boot_device *bootdev)
|
|
{
|
|
int err = 0;
|
|
unsigned int payload_offs;
|
|
struct spi_flash *flash;
|
|
unsigned int sf_bus = spl_spi_boot_bus();
|
|
unsigned int sf_cs = spl_spi_boot_cs();
|
|
struct spl_load_info load;
|
|
|
|
/*
|
|
* Load U-Boot image from SPI flash into RAM
|
|
* In DM mode: defaults speed and mode will be
|
|
* taken from DT when available
|
|
*/
|
|
flash = spi_flash_probe(sf_bus, sf_cs,
|
|
CONFIG_SF_DEFAULT_SPEED,
|
|
CONFIG_SF_DEFAULT_MODE);
|
|
if (!flash) {
|
|
puts("SPI probe failed.\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
load.priv = flash;
|
|
spl_set_bl_len(&load, 1);
|
|
load.read = spl_spi_fit_read;
|
|
|
|
#if CONFIG_IS_ENABLED(OS_BOOT)
|
|
if (spl_start_uboot()) {
|
|
int err = spl_load(spl_image, bootdev, &load, 0,
|
|
CFG_SYS_SPI_KERNEL_OFFS);
|
|
|
|
if (!err)
|
|
/* Read device tree. */
|
|
return spi_flash_read(flash, CFG_SYS_SPI_ARGS_OFFS,
|
|
CFG_SYS_SPI_ARGS_SIZE,
|
|
(void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR);
|
|
}
|
|
#endif
|
|
|
|
payload_offs = spl_spi_get_uboot_offs(flash);
|
|
if (CONFIG_IS_ENABLED(OF_REAL)) {
|
|
payload_offs = ofnode_conf_read_int("u-boot,spl-payload-offset",
|
|
payload_offs);
|
|
}
|
|
|
|
err = spl_load(spl_image, bootdev, &load, 0, payload_offs);
|
|
if (IS_ENABLED(CONFIG_SPI_FLASH_SOFT_RESET))
|
|
err = spi_nor_remove(flash);
|
|
return err;
|
|
}
|
|
/* Use priorty 1 so that boards can override this */
|
|
SPL_LOAD_IMAGE_METHOD("SPI", 1, BOOT_DEVICE_SPI, spl_spi_load_image);
|