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] fixup! ARM: i.MX: boot: interpret reserved boot as forced serial
Date: Mon, 11 May 2020 08:17:03 +0200	[thread overview]
Message-ID: <20200511061703.593030-1-ahmad@a3f.at> (raw)

imx6_get_boot_source is used by the zii-imx6q-rdu2 board in PBL,
but cpu_is_mx6ul accesses a global variable that's not linked
into PBL. Fix this by using cpu_mx6_is_mx6ul instead.

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

diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
index dcca3a5c4a97..ef868301cd6b 100644
--- a/arch/arm/mach-imx/boot.c
+++ b/arch/arm/mach-imx/boot.c
@@ -348,7 +348,7 @@ static bool imx6_bootsource_serial(uint32_t sbmr2)
 
 static bool imx6_bootsource_serial_forced(uint32_t bootmode)
 {
-	if (cpu_is_mx6ul() || cpu_is_mx6ull())
+	if (cpu_mx6_is_mx6ul() || cpu_mx6_is_mx6ull())
 		return bootmode == 2;
 	return bootmode == 1;
 }
-- 
2.20.1


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

             reply	other threads:[~2020-05-11  6:17 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-11  6:17 Ahmad Fatoum [this message]
2020-05-11  6:41 ` 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=20200511061703.593030-1-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