[PATCH] fixup! ARM: i.MX: boot: interpret reserved boot as forced serial

[PATCH] fixup! ARM: i.MX: boot: interpret reserved boot as forced serial

[Ahmad Fatoum]

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

Re: [PATCH] fixup! ARM: i.MX: boot: interpret reserved boot as forced serial

[Sascha Hauer]

On Mon, May 11, 2020 at 08:17:03AM +0200, Ahmad Fatoum wrote:
> 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>

Yeah, thanks, I was about to complain because my compile test failed ;)

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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