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

spl: Convert spl_onenand_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:03 -06:00 committed by Tom Rini
parent d5c2b11ce4
commit afa6e6c488
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/spl/spl.c
View File

@ -384,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_ONENAND_SUPPORT
case BOOT_DEVICE_ONENAND:
return spl_onenand_load_image(&bootdev);
#endif
#ifdef CONFIG_SPL_NOR_SUPPORT #ifdef CONFIG_SPL_NOR_SUPPORT
case BOOT_DEVICE_NOR: case BOOT_DEVICE_NOR:
return spl_nor_load_image(&bootdev); return spl_nor_load_image(&bootdev);

4
common/spl/spl_onenand.c
View File

@ -14,7 +14,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <onenand_uboot.h> #include <onenand_uboot.h>
int spl_onenand_load_image(struct spl_boot_device *bootdev) static int spl_onenand_load_image(struct spl_boot_device *bootdev)
{ {
struct image_header *header; struct image_header *header;
int ret; int ret;
@ -34,3 +34,5 @@ int spl_onenand_load_image(struct spl_boot_device *bootdev)
return 0; return 0;
} }
/* Use priorty 1 so that Ubi can override this */
SPL_LOAD_IMAGE_METHOD(1, BOOT_DEVICE_ONENAND, spl_onenand_load_image);

3
include/spl.h
View File

@ -181,9 +181,6 @@ struct spl_image_loader {
.load_image = __method, \ .load_image = __method, \
} }
/* OneNAND SPL functions */
int spl_onenand_load_image(struct spl_boot_device *bootdev);
/* NOR SPL functions */ /* NOR SPL functions */
int spl_nor_load_image(struct spl_boot_device *bootdev); int spl_nor_load_image(struct spl_boot_device *bootdev);