imx: mx6ull: fix USB bmode for i.MX 6UL and 6ULL

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.esponde@honeywell.com>
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Tested-by: Joël Esponde <joel.esponde@honeywell.com>

diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index 2bedbdbf20c69fa17c3fe0863b21c2c9e15fe499..b881766487050690ace98060695c6eacc2f3039c 100644 (file)
--- 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)},