Re: [U-Boot] [PATCH] imx_common: check for bmode Serial Downloader

[Stefano Babic]

On 27/12/2016 17:01, Stefan Agner wrote:
> From: Stefan Agner 
> 
> Before commit 81c4eccb55cc ("imx: mx6: fix USB bmode to use
> reserved value") a non-reserved value has been used to trigger
> Serial Downloader using bmode, which translated to a GPR9 value
> of 0x10. However, on some boards the non-reserved value lead to
> unreliable bmode command. With the above mentioned commit, U-boot
> switched to use [7:4] b0001, which translates to GPR9 0x10 for
> Serial Downloader mode. Check for the new value and classify it
> as Serial Downloader mode.
> 
> Signed-off-by: Stefan Agner 
> CC: Stefano Babic 
> CC: Tim Harvey 
> CC: Fabio Estevam 
> CC: Eric Nelson 
> ---
> 
>  arch/arm/imx-common/spl.c | 6 --
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c
> index bdcda7de93..098953dce1 100644
> --- a/arch/arm/imx-common/spl.c
> +++ b/arch/arm/imx-common/spl.c
> @@ -26,8 +26,7 @@ u32 spl_boot_device(void)
>* Check for BMODE if serial downloader is enabled
>* BOOT_MODE - see IMX6DQRM Table 8-1
>*/
> - if bmode >> 24) & 0x03)  == 0x01) || /* Serial Downloader */
> - (gpr10_boot && (reg == 1)))
> + if (((bmode >> 24) & 0x03) == 0x01) /* Serial Downloader */
>   return BOOT_DEVICE_UART;
>   /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */
>   switch ((reg & 0x00FF) >> 4) {
> @@ -39,6 +38,9 @@ u32 spl_boot_device(void)
>   else
>   return BOOT_DEVICE_NOR;
>   break;
> + /* Reserved: Used to force Serial Downloader */
> + case 0x1:
> + return BOOT_DEVICE_UART;
>   /* SATA: See 8.5.4, Table 8-20 */
>   case 0x2:
>   return BOOT_DEVICE_SATA;
> 

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

-- 
=
DENX Software Engineering GmbH,  Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de
=
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH] imx_common: check for bmode Serial Downloader

[Stefan Agner]

From: Stefan Agner 

Before commit 81c4eccb55cc ("imx: mx6: fix USB bmode to use
reserved value") a non-reserved value has been used to trigger
Serial Downloader using bmode, which translated to a GPR9 value
of 0x10. However, on some boards the non-reserved value lead to
unreliable bmode command. With the above mentioned commit, U-boot
switched to use [7:4] b0001, which translates to GPR9 0x10 for
Serial Downloader mode. Check for the new value and classify it
as Serial Downloader mode.

Signed-off-by: Stefan Agner 
CC: Stefano Babic 
CC: Tim Harvey 
CC: Fabio Estevam 
CC: Eric Nelson 
---

 arch/arm/imx-common/spl.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c
index bdcda7de93..098953dce1 100644
--- a/arch/arm/imx-common/spl.c
+++ b/arch/arm/imx-common/spl.c
@@ -26,8 +26,7 @@ u32 spl_boot_device(void)
 * Check for BMODE if serial downloader is enabled
 * BOOT_MODE - see IMX6DQRM Table 8-1
 */
-   if bmode >> 24) & 0x03)  == 0x01) || /* Serial Downloader */
-   (gpr10_boot && (reg == 1)))
+   if (((bmode >> 24) & 0x03) == 0x01) /* Serial Downloader */
return BOOT_DEVICE_UART;
/* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */
switch ((reg & 0x00FF) >> 4) {
@@ -39,6 +38,9 @@ u32 spl_boot_device(void)
else
return BOOT_DEVICE_NOR;
break;
+   /* Reserved: Used to force Serial Downloader */
+   case 0x1:
+   return BOOT_DEVICE_UART;
/* SATA: See 8.5.4, Table 8-20 */
case 0x2:
return BOOT_DEVICE_SATA;
-- 
2.11.0

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot