| Message ID | 1474762817-23091-15-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Sat, Sep 24, 2016 at 06:20:04PM -0600, Simon Glass wrote: > 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>
On Sat, Sep 24, 2016 at 06:20:04PM -0600, Simon Glass wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/common/spl/spl.c b/common/spl/spl.c index b838b3a..2ea7c4e 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -373,10 +373,6 @@ static int spl_load_image(u32 boot_device) return loader->load_image(&bootdev); switch (boot_device) { -#ifdef CONFIG_SPL_NOR_SUPPORT - case BOOT_DEVICE_NOR: - return spl_nor_load_image(&bootdev); -#endif #ifdef CONFIG_SPL_YMODEM_SUPPORT case BOOT_DEVICE_UART: return spl_ymodem_load_image(&bootdev); diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index f10d679..b55fcc5 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -7,7 +7,7 @@ #include <common.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; /* @@ -70,3 +70,4 @@ int spl_nor_load_image(struct spl_boot_device *bootdev) return 0; } +SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_NOR, spl_nor_load_image); diff --git a/include/spl.h b/include/spl.h index b7a3592..6338bcf 100644 --- a/include/spl.h +++ b/include/spl.h @@ -181,9 +181,6 @@ struct spl_image_loader { .load_image = __method, \ } -/* NOR SPL functions */ -int spl_nor_load_image(struct spl_boot_device *bootdev); - /* YMODEM SPL functions */ int spl_ymodem_load_image(struct spl_boot_device *bootdev);
Add a linker list declaration for this method and remove the explicit switch() code. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v2: None common/spl/spl.c | 4 ---- common/spl/spl_nor.c | 3 ++- include/spl.h | 3 --- 3 files changed, 2 insertions(+), 8 deletions(-)