From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 21/27] spl: Convert spl_net_load_image() to use linker list
Date: Sun, 18 Sep 2016 13:45:10 -0600 [thread overview]
Message-ID: <1474227917-9256-22-git-send-email-sjg@chromium.org> (raw)
In-Reply-To: <1474227917-9256-1-git-send-email-sjg@chromium.org>
Add a linker list declaration for this method and remove the explicit
switch() code. We need two variants - one for BOOT_DEVICE_CPGMAC and one for
BOOT_DEVICE_USBETH.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
common/spl/spl.c | 12 ------------
common/spl/spl_net.c | 26 +++++++++++++++++++++++++-
include/spl.h | 3 ---
3 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 1d4f258..c5b5572 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -373,18 +373,6 @@ static int spl_load_image(u32 boot_device)
return loader->load_image(&bootdev);
switch (boot_device) {
-#ifdef CONFIG_SPL_ETH_SUPPORT
- case BOOT_DEVICE_CPGMAC:
-#ifdef CONFIG_SPL_ETH_DEVICE
- bootdev.boot_device_name = CONFIG_SPL_ETH_DEVICE;
-#endif
- return spl_net_load_image(&bootdev);
-#endif
-#ifdef CONFIG_SPL_USBETH_SUPPORT
- case BOOT_DEVICE_USBETH:
- bootdev.boot_device_name = "usb_ether";
- return spl_net_load_image(&bootdev);
-#endif
#ifdef CONFIG_SPL_BOARD_LOAD_IMAGE
case BOOT_DEVICE_BOARD:
return spl_board_load_image(&bootdev);
diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index 730f88e..0cbd995 100644
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -14,7 +14,8 @@
DECLARE_GLOBAL_DATA_PTR;
-int spl_net_load_image(struct spl_boot_device *bootdev)
+#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)
+static int spl_net_load_image(struct spl_boot_device *bootdev)
{
int rv;
@@ -37,3 +38,26 @@ int spl_net_load_image(struct spl_boot_device *bootdev)
return spl_parse_image_header(&spl_image,
(struct image_header *)load_addr);
}
+#endif
+
+#ifdef CONFIG_SPL_ETH_SUPPORT
+int spl_net_load_image_cpgmac(struct spl_boot_device *bootdev)
+{
+#ifdef CONFIG_SPL_ETH_DEVICE
+ bootdev->boot_device_name = CONFIG_SPL_ETH_DEVICE;
+#endif
+
+ return spl_net_load_image(bootdev);
+}
+SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_CPGMAC, spl_net_load_image_cpgmac);
+#endif
+
+#ifdef CONFIG_SPL_USBETH_SUPPORT
+int spl_net_load_image_usb(struct spl_boot_device *bootdev)
+{
+ bootdev->boot_device_name = "usb_ether";
+
+ return spl_net_load_image(bootdev);
+}
+SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_USBETH, spl_net_load_image_usb);
+#endif
diff --git a/include/spl.h b/include/spl.h
index 29dcf5b..24a6ec4 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -181,9 +181,6 @@ struct spl_image_loader {
.load_image = __method, \
}
-/* Ethernet SPL functions */
-int spl_net_load_image(struct spl_boot_device *bootdev);
-
/* SPL FAT image functions */
int spl_load_image_fat(struct blk_desc *block_dev, int partition,
const char *filename);
--
2.8.0.rc3.226.g39d4020
next prev parent reply other threads:[~2016-09-18 19:45 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-18 19:44 [U-Boot] [PATCH 00/27] spl: Use linker list and parameters for SPL image loading Simon Glass
2016-09-18 19:44 ` [U-Boot] [PATCH 01/27] spl: Move spl_board_load_image() into a generic header Simon Glass
2016-09-18 22:14 ` Tom Rini
2016-09-18 19:44 ` [U-Boot] [PATCH 02/27] spl: Add a parameter to spl_set_header_raw_uboot() Simon Glass
2016-09-18 22:14 ` Tom Rini
2016-09-18 19:44 ` [U-Boot] [PATCH 03/27] spl: Add a parameter to spl_parse_image_header() Simon Glass
2016-09-18 22:15 ` Tom Rini
2016-09-18 19:44 ` [U-Boot] [PATCH 04/27] spl: Add a parameter to jump_to_image_linux() Simon Glass
2016-09-18 22:15 ` Tom Rini
2016-09-18 19:44 ` [U-Boot] [PATCH 05/27] spl: Add function comments to spl_start_uboot() Simon Glass
2016-09-18 22:15 ` Tom Rini
2016-09-18 19:44 ` [U-Boot] [PATCH 06/27] spl: Kconfig: Move SPL_DISPLAY_PRINT to Kconfig Simon Glass
2016-09-18 22:15 ` Tom Rini
2016-09-18 19:44 ` [U-Boot] [PATCH 07/27] spl: Convert boot_device into a struct Simon Glass
2016-09-18 22:15 ` Tom Rini
2016-09-18 19:44 ` [U-Boot] [PATCH 08/27] spl: Add a way to declare an SPL image loader Simon Glass
2016-09-18 22:15 ` Tom Rini
2016-09-19 3:22 ` Simon Glass
2016-09-18 19:44 ` [U-Boot] [PATCH 09/27] spl: Convert spl_ram_load_image() to use linker list Simon Glass
2016-09-18 19:44 ` [U-Boot] [PATCH 10/27] spl: Convert spl_mmc_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 11/27] spl: Convert spl_ubi_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 12/27] spl: Convert spl_nand_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 13/27] spl: Convert spl_onenand_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 14/27] spl: Convert spl_nor_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 15/27] spl: Convert spl_ymodem_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 16/27] spl: Convert spl_usb_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 17/27] spl: Convert spl_sata_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 18/27] spl: spi: Move the generic SPI loader into common/spl Simon Glass
2016-09-19 0:30 ` Tom Rini
2016-09-18 19:45 ` [U-Boot] [PATCH 19/27] spl: Convert spl_spi_load_image() to use linker list Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 20/27] spi: Move freescale-specific code into a private header Simon Glass
2016-09-18 19:45 ` Simon Glass [this message]
2016-09-18 19:45 ` [U-Boot] [PATCH 22/27] spl: Convert spl_board_load_image() to use linker list Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 23/27] spl: Pass spl_image as a parameter to load_image() methods Simon Glass
2016-09-19 0:30 ` Tom Rini
2016-09-18 19:45 ` [U-Boot] [PATCH 24/27] spl: Update ext functions to take an spl_image parameter Simon Glass
2016-09-19 0:30 ` Tom Rini
2016-09-18 19:45 ` [U-Boot] [PATCH 25/27] spl: Update fat " Simon Glass
2016-09-19 0:30 ` Tom Rini
2016-09-18 19:45 ` [U-Boot] [PATCH 26/27] spl: Update spl_load_simple_fit() to take an spl_image param Simon Glass
2016-09-19 0:31 ` Tom Rini
2016-09-18 19:45 ` [U-Boot] [PATCH 27/27] spl: Make spl_boot_list a local variable Simon Glass
2016-09-19 0:31 ` Tom Rini
2016-09-18 22:14 ` [U-Boot] [PATCH 00/27] spl: Use linker list and parameters for SPL image loading Tom Rini
2016-09-19 0:57 ` Simon Glass
2016-09-19 21:46 ` Tom Rini
2016-09-19 3:18 ` Simon Glass
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=1474227917-9256-22-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox