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

spl: Convert spl_nor_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:04 -06:00 committed by Tom Rini
parent afa6e6c488
commit 548b3ee73c
3 changed files with 2 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_NOR_SUPPORT
case BOOT_DEVICE_NOR:
return spl_nor_load_image(&bootdev);
#endif
#ifdef CONFIG_SPL_YMODEM_SUPPORT #ifdef CONFIG_SPL_YMODEM_SUPPORT
case BOOT_DEVICE_UART: case BOOT_DEVICE_UART:
return spl_ymodem_load_image(&bootdev); return spl_ymodem_load_image(&bootdev);

3
common/spl/spl_nor.c
View File

@ -7,7 +7,7 @@
#include <common.h> #include <common.h>
#include <spl.h> #include <spl.h>
int spl_nor_load_image(struct spl_boot_device *bootdev) static int spl_nor_load_image(struct spl_boot_device *bootdev)
{ {
int ret; int ret;
/* /*
@ -70,3 +70,4 @@ int spl_nor_load_image(struct spl_boot_device *bootdev)
return 0; return 0;
} }
SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_NOR, spl_nor_load_image);

3
include/spl.h
View File

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