minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-12 13:35:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

SPL: SPI: Enhance spi_spl_load to match the other load functions

Browse Source 
Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Tom Rini 2012-08-14 14:34:10 -07:00
parent 022b4975c8
commit a4cc1c4877
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/spl/spl.c
View File

@ -167,8 +167,8 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
#endif #endif
#ifdef CONFIG_SPL_SPI_SUPPORT #ifdef CONFIG_SPL_SPI_SUPPORT
case BOOT_DEVICE_SPI: case BOOT_DEVICE_SPI:
spi_boot(); spl_spi_load_image();
break; break;
#endif #endif
default: default:
puts("SPL: Un-supported Boot Device\n"); puts("SPL: Un-supported Boot Device\n");

23
drivers/mtd/spi/spi_spl_load.c
View File

@ -24,16 +24,17 @@
#include <common.h> #include <common.h>
#include <spi_flash.h> #include <spi_flash.h>
#include <spl.h>
/* /*
* The main entry for SPI booting. It's necessary that SDRAM is already * 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 * configured and available since this code loads the main U-Boot image
* from SPI into SDRAM and starts it from there. * from SPI into SDRAM and starts it from there.
*/ */
void spi_boot(void) void spl_spi_load_image(void)
{ {
struct spi_flash *flash; struct spi_flash *flash;
void (*uboot)(void) __noreturn; struct image_header *header;
/* /*
* Load U-Boot image from SPI flash into RAM * Load U-Boot image from SPI flash into RAM
@ -42,17 +43,17 @@ void spi_boot(void)
flash = spi_flash_probe(CONFIG_SPL_SPI_BUS, CONFIG_SPL_SPI_CS, flash = spi_flash_probe(CONFIG_SPL_SPI_BUS, CONFIG_SPL_SPI_CS,
CONFIG_SF_DEFAULT_SPEED, SPI_MODE_3); CONFIG_SF_DEFAULT_SPEED, SPI_MODE_3);
if (!flash) { if (!flash) {
puts("failed.\n"); puts("SPI probe failed.\n");
hang(); hang();
} }
spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS, /* use CONFIG_SYS_TEXT_BASE as temporary storage area */
CONFIG_SYS_SPI_U_BOOT_SIZE, header = (struct image_header *)(CONFIG_SYS_TEXT_BASE);
(void *) CONFIG_SYS_TEXT_BASE);
/* /* Load u-boot, mkimage header is 64 bytes. */
* Jump to U-Boot image spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS, 0x40,
*/ (void *) header);
uboot = (void *) CONFIG_SYS_TEXT_BASE; spl_parse_image_header(header);
(*uboot)(); spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS,
spl_image.size, (void *)spl_image.load_addr);
} }

2
include/spl.h
View File

@ -69,7 +69,7 @@ void spl_mmc_load_image(void);
void spl_ymodem_load_image(void); void spl_ymodem_load_image(void);
/* SPI SPL functions */ /* SPI SPL functions */
void spi_boot(void); void spl_spi_load_image(void);
#ifdef CONFIG_SPL_BOARD_INIT #ifdef CONFIG_SPL_BOARD_INIT
void spl_board_init(void); void spl_board_init(void);