mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v3 08/10] ARM: i.MX: bbu: Allow plain i.MX v1 images as a special case
Date: Tue, 26 Jun 2018 18:04:10 -0700	[thread overview]
Message-ID: <20180627010412.20646-9-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180627010412.20646-1-andrew.smirnov@gmail.com>

If we are passed a plain i.MX v1 image without the usual 1K preamble -
assume a special case and don't try to apply bbu_force() logic.

This is useful in cases where a board specific quirk to make BBU work
is needed.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 arch/arm/mach-imx/imx-bbu-internal.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c
index 7735273b4..8c44d601d 100644
--- a/arch/arm/mach-imx/imx-bbu-internal.c
+++ b/arch/arm/mach-imx/imx-bbu-internal.c
@@ -133,9 +133,19 @@ err_close:
 
 static int imx_bbu_check_prereq(const char *devicefile, struct bbu_data *data)
 {
+	enum filetype type;
 	int ret;
 
-	if (file_detect_type(data->image, data->len) != filetype_arm_barebox) {
+	type = file_detect_type(data->image, data->len);
+
+	switch (type) {
+	case filetype_imx_image_v1:
+		pr_debug("Detected %s. Assuming special case\n",
+			 file_type_to_string(type));
+		break;
+	case filetype_arm_barebox:
+		break;
+	default:
 		if (!bbu_force(data, "Not an ARM barebox image"))
 			return -EINVAL;
 	}
-- 
2.17.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2018-06-27  1:04 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-27  1:04 [PATCH v3 00/10] ZII RDU1 support Andrey Smirnov
2018-06-27  1:04 ` [PATCH v3 01/10] mtd: mtd_dataflash: Don't print bogus command values for READs Andrey Smirnov
2018-06-27  1:04 ` [PATCH v3 02/10] common: clock: Sample time before poller_call() Andrey Smirnov
2018-06-27  1:04 ` [PATCH v3 03/10] ARM: babbage: Make PMIC initialization shareable Andrey Smirnov
2018-06-27  1:04 ` [PATCH v3 04/10] bbu: Make bbu_find_handler_by_device() public Andrey Smirnov
2018-06-27  1:04 ` [PATCH v3 05/10] ARM: i.MX: bbu: Make imx_bbu_internal_v1_update() public Andrey Smirnov
2018-06-27  1:04 ` [PATCH v3 06/10] ARM: i.MX: Move i.MX header definitions to mach-imx Andrey Smirnov
2018-06-27  1:04 ` [PATCH v3 07/10] filtype: Add code to detect i.MX image v1 Andrey Smirnov
2018-06-27  1:04 ` Andrey Smirnov [this message]
2018-06-27  1:04 ` [PATCH v3 09/10] ARM: i.MX: bbu: Make struct imx_internal_bbu_handler public Andrey Smirnov
2018-06-27  1:04 ` [PATCH v3 10/10] ARM: i.MX: Add support for ZII RDU1 board Andrey Smirnov
2018-06-27  5:32   ` Nikita Yushchenko
2018-06-27 17:12     ` Andrey Smirnov
2018-06-27  9:00 ` [PATCH v3 00/10] ZII RDU1 support Lucas Stach

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=20180627010412.20646-9-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    /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