mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <ahmad@a3f.at>
To: barebox@lists.infradead.org
Subject: [PATCH 3/3] ARM: i.MX6: boot: handle i.MX6UL differences
Date: Mon, 27 Apr 2020 09:13:51 +0200	[thread overview]
Message-ID: <20200427071351.467859-3-ahmad@a3f.at> (raw)
In-Reply-To: <20200427071351.467859-1-ahmad@a3f.at>

The i.MX6UL differs from the i.MX6Q in the interpretation of the first
two values for BOOT_CFG(7, 4):

+--------------+----------+----------+
|BOOT_CFG1(7,4)|   0x01   |   0x02   |
|==============+==========+==========|
| MX6Q         | reserved |   SATA   |
|--------------+----------+----------|
| MX6UL        |   QSPI   | reserved |
+--------------+----------+----------+

The reserved (forced serial) values are handled in the previous commit.
Add QSPI boot source detection now.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 arch/arm/mach-imx/boot.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
index f8d4f8cfa27f..dcca3a5c4a97 100644
--- a/arch/arm/mach-imx/boot.c
+++ b/arch/arm/mach-imx/boot.c
@@ -427,6 +427,9 @@ void imx6_get_boot_source(enum bootsource *src, int *instance)
 	}
 
 	switch (bootsrc) {
+	case 1: /* only reachable for i.MX6UL(L) */
+		*src = BOOTSOURCE_SPI; /* Really: qspi */
+		return;
 	case 2: /* unreachable for i.MX6UL(L) */
 		*src = BOOTSOURCE_HD;
 		break;
-- 
2.20.1


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

  parent reply	other threads:[~2020-04-27  7:14 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-27  7:13 [PATCH 1/3] ARM: i.MX: boot: correctly handle SRC_SBMR1 override via SRC_GPR9 Ahmad Fatoum
2020-04-27  7:13 ` [PATCH 2/3] ARM: i.MX: boot: interpret reserved boot as forced serial Ahmad Fatoum
2020-04-27  7:13 ` Ahmad Fatoum [this message]
2020-04-27  8:07 ` [PATCH 1/3] ARM: i.MX: boot: correctly handle SRC_SBMR1 override via SRC_GPR9 Sascha Hauer
2020-04-27  8:28   ` Ahmad Fatoum
2020-05-08  6:41     ` Ahmad Fatoum
2020-05-08 12:07       ` Sascha Hauer

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=20200427071351.467859-3-ahmad@a3f.at \
    --to=ahmad@a3f.at \
    --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