mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2025-09-20 05:11:30 +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>
92 lines
2.2 KiB
C
92 lines
2.2 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright 2013 Freescale Semiconductor, Inc.
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <cpu_func.h>
|
|
#include <hang.h>
|
|
#include <spi_flash.h>
|
|
#include <malloc.h>
|
|
|
|
#define ESPI_BOOT_IMAGE_SIZE 0x48
|
|
#define ESPI_BOOT_IMAGE_ADDR 0x50
|
|
#define CFG_CFG_DATA_SECTOR 0
|
|
|
|
void fsl_spi_spl_load_image(uint32_t offs, unsigned int size, void *vdst)
|
|
{
|
|
struct spi_flash *flash;
|
|
|
|
flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
|
|
CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
|
|
if (flash == NULL) {
|
|
puts("\nspi_flash_probe failed");
|
|
hang();
|
|
}
|
|
|
|
spi_flash_read(flash, offs, size, vdst);
|
|
}
|
|
|
|
/*
|
|
* 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.
|
|
*/
|
|
void fsl_spi_boot(void)
|
|
{
|
|
void (*uboot)(void) __noreturn;
|
|
u32 offset, code_len, copy_len = 0;
|
|
#ifndef CONFIG_FSL_CORENET
|
|
unsigned char *buf = NULL;
|
|
#endif
|
|
struct spi_flash *flash;
|
|
|
|
flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
|
|
CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
|
|
if (flash == NULL) {
|
|
puts("\nspi_flash_probe failed");
|
|
hang();
|
|
}
|
|
|
|
#ifdef CONFIG_FSL_CORENET
|
|
offset = CFG_SYS_SPI_FLASH_U_BOOT_OFFS;
|
|
code_len = CFG_SYS_SPI_FLASH_U_BOOT_SIZE;
|
|
#else
|
|
/*
|
|
* Load U-Boot image from SPI flash into RAM
|
|
*/
|
|
buf = malloc(flash->page_size);
|
|
if (buf == NULL) {
|
|
puts("\nmalloc failed");
|
|
hang();
|
|
}
|
|
memset(buf, 0, flash->page_size);
|
|
|
|
spi_flash_read(flash, CFG_CFG_DATA_SECTOR,
|
|
flash->page_size, (void *)buf);
|
|
offset = *(u32 *)(buf + ESPI_BOOT_IMAGE_ADDR);
|
|
/* Skip spl code */
|
|
offset += CFG_SYS_SPI_FLASH_U_BOOT_OFFS;
|
|
/* Get the code size from offset 0x48 */
|
|
code_len = *(u32 *)(buf + ESPI_BOOT_IMAGE_SIZE);
|
|
/* Skip spl code */
|
|
code_len = code_len - CONFIG_SPL_MAX_SIZE;
|
|
#endif
|
|
/* copy code to DDR */
|
|
printf("Loading second stage boot loader ");
|
|
while (copy_len <= code_len) {
|
|
spi_flash_read(flash, offset + copy_len, 0x2000,
|
|
(void *)(CFG_SYS_SPI_FLASH_U_BOOT_DST
|
|
+ copy_len));
|
|
copy_len = copy_len + 0x2000;
|
|
putc('.');
|
|
}
|
|
|
|
/*
|
|
* Jump to U-Boot image
|
|
*/
|
|
flush_cache(CFG_SYS_SPI_FLASH_U_BOOT_DST, code_len);
|
|
uboot = (void *)CFG_SYS_SPI_FLASH_U_BOOT_START;
|
|
(*uboot)();
|
|
}
|