All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 25/27] spl: Update fat functions to take an spl_image parameter
Date: Sat, 24 Sep 2016 18:20:15 -0600	[thread overview]
Message-ID: <1474762817-23091-26-git-send-email-sjg@chromium.org> (raw)
In-Reply-To: <1474762817-23091-1-git-send-email-sjg@chromium.org>

Update the fat loader to avoid using the spl_image global variable.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

Changes in v2: None

 common/spl/spl_fat.c  | 21 ++++++++++++---------
 common/spl/spl_mmc.c  |  4 ++--
 common/spl/spl_sata.c | 11 +++++++----
 common/spl/spl_usb.c  | 13 ++++++++-----
 include/spl.h         |  6 ++++--
 5 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index 68702a2..e2bb000 100644
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -54,9 +54,9 @@ static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset,
 	return actread;
 }
 
-int spl_load_image_fat(struct blk_desc *block_dev,
-						int partition,
-						const char *filename)
+int spl_load_image_fat(struct spl_image_info *spl_image,
+		       struct blk_desc *block_dev, int partition,
+		       const char *filename)
 {
 	int err;
 	struct image_header *header;
@@ -84,12 +84,12 @@ int spl_load_image_fat(struct blk_desc *block_dev,
 
 		return spl_load_simple_fit(&load, 0, header);
 	} else {
-		err = spl_parse_image_header(&spl_image, header);
+		err = spl_parse_image_header(spl_image, header);
 		if (err)
 			goto end;
 
 		err = file_fat_read(filename,
-				    (u8 *)(uintptr_t)spl_image.load_addr, 0);
+				    (u8 *)(uintptr_t)spl_image->load_addr, 0);
 	}
 
 end:
@@ -103,7 +103,8 @@ end:
 }
 
 #ifdef CONFIG_SPL_OS_BOOT
-int spl_load_image_fat_os(struct blk_desc *block_dev, int partition)
+int spl_load_image_fat_os(struct spl_image_info *spl_image,
+			  struct blk_desc *block_dev, int partition)
 {
 	int err;
 	__maybe_unused char *file;
@@ -123,7 +124,8 @@ int spl_load_image_fat_os(struct blk_desc *block_dev, int partition)
 		}
 		file = getenv("falcon_image_file");
 		if (file) {
-			err = spl_load_image_fat(block_dev, partition, file);
+			err = spl_load_image_fat(spl_image, block_dev,
+						 partition, file);
 			if (err != 0) {
 				puts("spl: falling back to default\n");
 				goto defaults;
@@ -148,11 +150,12 @@ defaults:
 		return -1;
 	}
 
-	return spl_load_image_fat(block_dev, partition,
+	return spl_load_image_fat(spl_image, block_dev, partition,
 			CONFIG_SPL_FS_LOAD_KERNEL_NAME);
 }
 #else
-int spl_load_image_fat_os(struct blk_desc *block_dev, int partition)
+int spl_load_image_fat_os(struct spl_image_info *spl_image,
+			  struct blk_desc *block_dev, int partition)
 {
 	return -ENOSYS;
 }
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index 5f5d9d0..16a6b49 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -230,13 +230,13 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, struct mmc *mmc)
 
 #ifdef CONFIG_SPL_FAT_SUPPORT
 	if (!spl_start_uboot()) {
-		err = spl_load_image_fat_os(mmc_get_blk_desc(mmc),
+		err = spl_load_image_fat_os(spl_image, mmc_get_blk_desc(mmc),
 			CONFIG_SYS_MMCSD_FS_BOOT_PARTITION);
 		if (!err)
 			return err;
 	}
 #ifdef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
-	err = spl_load_image_fat(mmc_get_blk_desc(mmc),
+	err = spl_load_image_fat(spl_image, mmc_get_blk_desc(mmc),
 				 CONFIG_SYS_MMCSD_FS_BOOT_PARTITION,
 				 CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
 	if (!err)
diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 19b5ba5..a3c07cd 100644
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -41,12 +41,15 @@ static int spl_sata_load_image(struct spl_image_info *spl_image,
 	}
 
 #ifdef CONFIG_SPL_OS_BOOT
-	if (spl_start_uboot() || spl_load_image_fat_os(stor_dev,
-									CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
+	if (spl_start_uboot() ||
+	    spl_load_image_fat_os(spl_image, stor_dev,
+				  CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
 #endif
-	err = spl_load_image_fat(stor_dev,
-				CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
+	{
+		err = spl_load_image_fat(spl_image, stor_dev,
+					CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
 				CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
+	}
 	if (err) {
 		puts("Error loading sata device\n");
 		return err;
diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c
index aaa4f81..e37966e 100644
--- a/common/spl/spl_usb.c
+++ b/common/spl/spl_usb.c
@@ -48,12 +48,15 @@ static int spl_usb_load_image(struct spl_image_info *spl_image,
 	debug("boot mode - FAT\n");
 
 #ifdef CONFIG_SPL_OS_BOOT
-		if (spl_start_uboot() || spl_load_image_fat_os(stor_dev,
-								CONFIG_SYS_USB_FAT_BOOT_PARTITION))
+	if (spl_start_uboot() ||
+	    spl_load_image_fat_os(spl_image, stor_dev,
+				  CONFIG_SYS_USB_FAT_BOOT_PARTITION))
 #endif
-		err = spl_load_image_fat(stor_dev,
-				CONFIG_SYS_USB_FAT_BOOT_PARTITION,
-				CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
+	{
+		err = spl_load_image_fat(spl_image, stor_dev,
+					CONFIG_SYS_USB_FAT_BOOT_PARTITION,
+					CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
+	}
 
 	if (err) {
 		puts("Error loading from USB device\n");
diff --git a/include/spl.h b/include/spl.h
index 25f6ffe..947fc75 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -184,9 +184,11 @@ struct spl_image_loader {
 	}
 
 /* SPL FAT image functions */
-int spl_load_image_fat(struct blk_desc *block_dev, int partition,
+int spl_load_image_fat(struct spl_image_info *spl_image,
+		       struct blk_desc *block_dev, int partition,
 		       const char *filename);
-int spl_load_image_fat_os(struct blk_desc *block_dev, int partition);
+int spl_load_image_fat_os(struct spl_image_info *spl_image,
+			  struct blk_desc *block_dev, int partition);
 
 void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image);
 
-- 
2.8.0.rc3.226.g39d4020

  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 ` [U-Boot] [PATCH v2 16/27] spl: Convert spl_usb_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 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 ` Simon Glass [this message]
2016-10-07  0:35   ` [U-Boot] [U-Boot, v2, 25/27] spl: Update fat " 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-26-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.