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

spl: Convert spl_ubi_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>
This commit is contained in:
Simon Glass 2016-09-24 18:20:01 -06:00 committed by Tom Rini
parent 0fed9c7ed6
commit 7d7dd821b0
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/spl/spl.c
View File

@ -384,11 +384,6 @@ static int spl_load_image(u32 boot_device)
return loader->load_image(&bootdev);
switch (boot_device) {
#ifdef CONFIG_SPL_UBI
case BOOT_DEVICE_NAND:
case BOOT_DEVICE_ONENAND:
return spl_ubi_load_image(&bootdev);
#else
#ifdef CONFIG_SPL_NAND_SUPPORT
case BOOT_DEVICE_NAND:
return spl_nand_load_image(&bootdev);
@ -397,7 +392,6 @@ static int spl_load_image(u32 boot_device)
case BOOT_DEVICE_ONENAND:
return spl_onenand_load_image(&bootdev);
#endif
#endif
#ifdef CONFIG_SPL_NOR_SUPPORT
case BOOT_DEVICE_NOR:
return spl_nor_load_image(&bootdev);

3
common/spl/spl_ubi.c
View File

@ -76,3 +76,6 @@ out:
#endif
return ret;
}
/* Use priorty 0 so that Ubi will override NAND and ONENAND methods */
SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_NAND, spl_ubi_load_image);
SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_ONENAND, spl_ubi_load_image);

3
include/spl.h
View File

@ -190,9 +190,6 @@ int spl_onenand_load_image(struct spl_boot_device *bootdev);
/* NOR SPL functions */
int spl_nor_load_image(struct spl_boot_device *bootdev);
/* UBI SPL functions */
int spl_ubi_load_image(struct spl_boot_device *bootdev);
/* YMODEM SPL functions */
int spl_ymodem_load_image(struct spl_boot_device *bootdev);