From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 16/27] spl: Convert spl_usb_load_image() to use linker list
Date: Sat, 24 Sep 2016 18:20:06 -0600 [thread overview]
Message-ID: <1474762817-23091-17-git-send-email-sjg@chromium.org> (raw)
In-Reply-To: <1474762817-23091-1-git-send-email-sjg@chromium.org>
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_usb.c | 3 ++-
include/spl.h | 3 ---
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 1d037f5..5e7ced3 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -389,10 +389,6 @@ static int spl_load_image(u32 boot_device)
bootdev.boot_device_name = "usb_ether";
return spl_net_load_image(&bootdev);
#endif
-#ifdef CONFIG_SPL_USB_SUPPORT
- case BOOT_DEVICE_USB:
- return spl_usb_load_image(&bootdev);
-#endif
#ifdef CONFIG_SPL_SATA_SUPPORT
case BOOT_DEVICE_SATA:
return spl_sata_load_image(&bootdev);
diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c
index f990336..2bc321a 100644
--- a/common/spl/spl_usb.c
+++ b/common/spl/spl_usb.c
@@ -22,7 +22,7 @@ DECLARE_GLOBAL_DATA_PTR;
static int usb_stor_curr_dev = -1; /* current device */
#endif
-int spl_usb_load_image(struct spl_boot_device *bootdev)
+static int spl_usb_load_image(struct spl_boot_device *bootdev)
{
int err;
struct blk_desc *stor_dev;
@@ -61,3 +61,4 @@ int spl_usb_load_image(struct spl_boot_device *bootdev)
return 0;
}
+SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_USB, spl_usb_load_image);
diff --git a/include/spl.h b/include/spl.h
index 3605911..677e3a1 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -187,9 +187,6 @@ int spl_spi_load_image(struct spl_boot_device *bootdev);
/* Ethernet SPL functions */
int spl_net_load_image(struct spl_boot_device *bootdev);
-/* USB SPL functions */
-int spl_usb_load_image(struct spl_boot_device *bootdev);
-
/* SATA SPL functions */
int spl_sata_load_image(struct spl_boot_device *bootdev);
--
2.8.0.rc3.226.g39d4020
next prev parent reply other threads:[~2016-09-25 0:20 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-25 0:19 [U-Boot] [PATCH v2 00/27] spl: Use linker list and parameters for SPL image loading Simon Glass
2016-09-25 0:19 ` [U-Boot] [PATCH v2 01/27] spl: Move spl_board_load_image() into a generic header Simon Glass
2016-10-07 0:32 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:19 ` [U-Boot] [PATCH v2 02/27] spl: Add a parameter to spl_set_header_raw_uboot() Simon Glass
2016-10-07 0:32 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:19 ` [U-Boot] [PATCH v2 03/27] spl: Add a parameter to spl_parse_image_header() Simon Glass
2016-10-07 0:33 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:19 ` [U-Boot] [PATCH v2 04/27] spl: Add a parameter to jump_to_image_linux() Simon Glass
2016-10-07 0:33 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:19 ` [U-Boot] [PATCH v2 05/27] spl: Add function comments to spl_start_uboot() Simon Glass
2016-10-07 0:33 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:19 ` [U-Boot] [PATCH v2 06/27] spl: Kconfig: Move SPL_DISPLAY_PRINT to Kconfig Simon Glass
2016-09-28 1:45 ` Tom Rini
2016-10-07 0:33 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:19 ` [U-Boot] [PATCH v2 07/27] spl: Convert boot_device into a struct Simon Glass
2016-09-28 1:45 ` Tom Rini
2016-10-07 0:33 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:19 ` [U-Boot] [PATCH v2 08/27] spl: Add a way to declare an SPL image loader Simon Glass
2016-09-28 1:45 ` Tom Rini
2016-10-07 0:33 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:19 ` [U-Boot] [PATCH v2 09/27] spl: Convert spl_ram_load_image() to use linker list Simon Glass
2016-09-28 1:46 ` Tom Rini
2016-10-07 0:33 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 10/27] spl: Convert spl_mmc_load_image() " Simon Glass
2016-09-28 1:46 ` Tom Rini
2016-10-07 0:33 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 11/27] spl: Convert spl_ubi_load_image() " Simon Glass
2016-09-28 1:46 ` Tom Rini
2016-10-07 0:33 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 12/27] spl: Convert spl_nand_load_image() " Simon Glass
2016-09-28 1:46 ` Tom Rini
2016-10-07 0:33 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 13/27] spl: Convert spl_onenand_load_image() " Simon Glass
2016-09-28 1:46 ` Tom Rini
2016-10-07 0:34 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 14/27] spl: Convert spl_nor_load_image() " Simon Glass
2016-09-28 1:46 ` Tom Rini
2016-10-07 0:34 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 15/27] spl: Convert spl_ymodem_load_image() " Simon Glass
2016-09-28 1:46 ` Tom Rini
2016-10-07 0:34 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` Simon Glass [this message]
2016-09-28 1:46 ` [U-Boot] [PATCH v2 16/27] spl: Convert spl_usb_load_image() " Tom Rini
2016-10-07 0:34 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 17/27] spl: Convert spl_sata_load_image() " Simon Glass
2016-09-28 1:46 ` Tom Rini
2016-10-07 0:34 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 18/27] spl: spi: Move the generic SPI loader into common/spl Simon Glass
2016-10-07 0:34 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 19/27] spl: Convert spl_spi_load_image() to use linker list Simon Glass
2016-09-28 1:46 ` Tom Rini
2016-10-07 0:34 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 20/27] spi: Move freescale-specific code into a private header Simon Glass
2016-09-28 1:46 ` Tom Rini
2016-10-07 0:34 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 21/27] spl: Convert spl_net_load_image() to use linker list Simon Glass
2016-09-28 1:46 ` Tom Rini
2016-10-07 0:34 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 22/27] spl: Convert spl_board_load_image() " Simon Glass
2016-09-28 1:46 ` Tom Rini
2016-10-07 0:34 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 23/27] spl: Pass spl_image as a parameter to load_image() methods Simon Glass
2016-10-07 0:34 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 24/27] spl: Update ext functions to take an spl_image parameter Simon Glass
2016-10-07 0:35 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 25/27] spl: Update fat " Simon Glass
2016-10-07 0:35 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 26/27] spl: Update spl_load_simple_fit() to take an spl_image param Simon Glass
2016-10-07 0:35 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-09-25 0:20 ` [U-Boot] [PATCH v2 27/27] spl: Make spl_boot_list a local variable Simon Glass
2016-10-07 0:35 ` [U-Boot] [U-Boot, v2, " Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1474762817-23091-17-git-send-email-sjg@chromium.org \
--to=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.