All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sean Anderson <sean.anderson@seco.com>
To: Tom Rini <trini@konsulko.com>, u-boot@lists.denx.de
Cc: "Stefan Roese" <sr@denx.de>, "Marek Vasut" <marex@denx.de>,
	"Simon Glass" <sjg@chromium.org>, "Pali Rohár" <pali@kernel.org>,
	"Marek Behún" <marek.behun@nic.cz>,
	"Sean Anderson" <sean.anderson@seco.com>
Subject: [PATCH v3 5/9] spl: Convert net to spl_load
Date: Thu,  5 May 2022 16:16:51 -0400	[thread overview]
Message-ID: <20220505201655.645692-6-sean.anderson@seco.com> (raw)
In-Reply-To: <20220505201655.645692-1-sean.anderson@seco.com>

This converts the net load method to use spl_load. As a result, it also
adds support for LOAD_FIT_FULL and IMX images.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Stefan Roese <sr@denx.de>
---

(no changes since v1)

 common/spl/spl_net.c | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index a853e6aead..3b4374add6 100644
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -29,6 +29,10 @@ static int spl_net_load_image(struct spl_image_info *spl_image,
 			      struct spl_boot_device *bootdev)
 {
 	struct image_header *header = (struct image_header *)image_load_addr;
+	struct spl_load_info load = {
+		.bl_len = 1,
+		.read = spl_net_load_read,
+	};
 	int rv;
 
 	env_init();
@@ -47,25 +51,7 @@ static int spl_net_load_image(struct spl_image_info *spl_image,
 		return rv;
 	}
 
-	if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
-	    image_get_magic(header) == FDT_MAGIC) {
-		struct spl_load_info load;
-
-		debug("Found FIT\n");
-		load.bl_len = 1;
-		load.read = spl_net_load_read;
-		rv = spl_load_simple_fit(spl_image, &load, 0, header);
-	} else {
-		debug("Legacy image\n");
-
-		rv = spl_parse_image_header(spl_image, bootdev, header);
-		if (rv)
-			return rv;
-
-		memcpy((void *)spl_image->load_addr, header, spl_image->size);
-	}
-
-	return rv;
+	return spl_load(spl_image, bootdev, &load, header, 0, 0);
 }
 #endif
 
-- 
2.35.1.1320.gc452695387.dirty


  parent reply	other threads:[~2022-05-05 20:18 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-05 20:16 [PATCH v3 0/9] spl: Use common function for loading/parsing images Sean Anderson
2022-05-05 20:16 ` [PATCH v3 1/9] spl: Add generic spl_load function Sean Anderson
2022-06-16  9:42   ` Xavier Drudis Ferran
2022-06-16 15:41     ` Sean Anderson
2022-05-05 20:16 ` [PATCH v3 2/9] spl: Convert ext to use spl_load Sean Anderson
2022-05-05 20:16 ` [PATCH v3 3/9] spl: Convert fat to spl_load Sean Anderson
2022-05-06 16:18   ` Tom Rini
2022-05-05 20:16 ` [PATCH v3 4/9] spl: Convert mmc " Sean Anderson
2022-05-06 16:18   ` Tom Rini
2022-05-05 20:16 ` Sean Anderson [this message]
2022-05-06 16:19   ` [PATCH v3 5/9] spl: Convert net " Tom Rini
2022-05-05 20:16 ` [PATCH v3 6/9] spl: Convert nor " Sean Anderson
2022-05-05 20:16 ` [PATCH v3 7/9] spl: Convert semihosting " Sean Anderson
2022-05-05 20:16 ` [PATCH v3 8/9] spl: Convert spi " Sean Anderson
2022-05-06 16:18   ` Tom Rini
2022-05-06 16:28     ` Sean Anderson
2022-05-05 20:16 ` [PATCH v3 9/9] spl: spi: Consolidate spi_load_image_os into spl_spi_load_image Sean Anderson
2022-06-15 17:30 ` [PATCH v3 0/9] spl: Use common function for loading/parsing images 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=20220505201655.645692-6-sean.anderson@seco.com \
    --to=sean.anderson@seco.com \
    --cc=marek.behun@nic.cz \
    --cc=marex@denx.de \
    --cc=pali@kernel.org \
    --cc=sjg@chromium.org \
    --cc=sr@denx.de \
    --cc=trini@konsulko.com \
    --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.