On 09/06/2017 22:13, Stefan Agner wrote:
> From: Stefan Agner <stefan.ag...@toradex.com>
>
> i.MX 6UL and 6ULL have different boot device capabilities and
> use therefor use a different boot device selection table than
> other i.MX 6 devices. Particularly, the value which has been
> used so far (b0001) is assigned to QSPI boot for these two
> devices.
>
> There is no common reserved value for all i.MX 6devices. Use
> b0010 for i.MX 6UL and 6ULL via compile time ifdef.
>
> Reported-by: Joël Esponde <joel.espo...@honeywell.com>
> Signed-off-by: Stefan Agner <stefan.ag...@toradex.com>
> ---
> arch/arm/cpu/armv7/mx6/soc.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
> index dd94797514..9416bb8947 100644
> --- a/arch/arm/cpu/armv7/mx6/soc.c
> +++ b/arch/arm/cpu/armv7/mx6/soc.c
> @@ -548,7 +548,11 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char
> *mac)
> const struct boot_mode soc_boot_modes[] = {
> {"normal", MAKE_CFGVAL(0x00, 0x00, 0x00, 0x00)},
> /* reserved value should start rom usb */
> +#if defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)
> + {"usb", MAKE_CFGVAL(0x20, 0x00, 0x00, 0x00)},
> +#else
> {"usb", MAKE_CFGVAL(0x10, 0x00, 0x00, 0x00)},
> +#endif
> {"sata", MAKE_CFGVAL(0x20, 0x00, 0x00, 0x00)},
> {"ecspi1:0", MAKE_CFGVAL(0x30, 0x00, 0x00, 0x08)},
> {"ecspi1:1", MAKE_CFGVAL(0x30, 0x00, 0x00, 0x18)},
>
Applied to u-boot-imx, -next, 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
https://lists.denx.de/listinfo/u-boot
