V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

spl: Convert spl_ram_load_image() to use linker list 

Add a linker list declaration for this method and remove the explicit
switch() code.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
[trini: Include updating the DFU case]
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2016-09-24 18:19:59 -06:00 committed by Tom Rini
parent a0a8029058
commit 98136b2f26
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/spl/spl.c
View File

@ -191,6 +191,11 @@ static int spl_ram_load_image(struct spl_boot_device *bootdev)
header = (struct image_header *)CONFIG_SPL_LOAD_FIT_ADDRESS; header = (struct image_header *)CONFIG_SPL_LOAD_FIT_ADDRESS;
#if defined(CONFIG_SPL_DFU_SUPPORT)
if (bootdev->boot_device == BOOT_DEVICE_DFU)
spl_dfu_cmd(0, "dfu_alt_info_ram", "ram", "0");
#endif
if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) { image_get_magic(header) == FDT_MAGIC) {
struct spl_load_info load; struct spl_load_info load;
@ -215,6 +220,10 @@ static int spl_ram_load_image(struct spl_boot_device *bootdev)
return 0; return 0;
} }
SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_RAM, spl_ram_load_image);
#if defined(CONFIG_SPL_DFU_SUPPORT)
SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_DFU, spl_ram_load_image);
#endif
#endif #endif
int spl_init(void) int spl_init(void)
@ -375,10 +384,6 @@ static int spl_load_image(u32 boot_device)
return loader->load_image(&bootdev); return loader->load_image(&bootdev);
switch (boot_device) { switch (boot_device) {
#ifdef CONFIG_SPL_RAM_DEVICE
case BOOT_DEVICE_RAM:
return spl_ram_load_image(&bootdev);
#endif
#ifdef CONFIG_SPL_MMC_SUPPORT #ifdef CONFIG_SPL_MMC_SUPPORT
case BOOT_DEVICE_MMC1: case BOOT_DEVICE_MMC1:
case BOOT_DEVICE_MMC2: case BOOT_DEVICE_MMC2:
@ -427,11 +432,6 @@ static int spl_load_image(u32 boot_device)
case BOOT_DEVICE_USB: case BOOT_DEVICE_USB:
return spl_usb_load_image(&bootdev); return spl_usb_load_image(&bootdev);
#endif #endif
#ifdef CONFIG_SPL_DFU_SUPPORT
case BOOT_DEVICE_DFU:
spl_dfu_cmd(0, "dfu_alt_info_ram", "ram", "0");
return spl_ram_load_image(&bootdev);
#endif
#ifdef CONFIG_SPL_SATA_SUPPORT #ifdef CONFIG_SPL_SATA_SUPPORT
case BOOT_DEVICE_SATA: case BOOT_DEVICE_SATA:
return spl_sata_load_image(&bootdev); return spl_sata_load_image(&bootdev);