diff options
| author | Stefan Agner <[email protected]> | 2017-06-09 13:13:12 -0700 |
|---|---|---|
| committer | Stefano Babic <[email protected]> | 2017-07-12 09:42:33 +0200 |
| commit | 3fd9579085fae691760486f595b9eda228bfc656 (patch) | |
| tree | ae85db461249ac4b5c74d294e3b825c5be4d213f | |
| parent | 8be70bb4aa165e7ea7bd5331ee2d045fca686c5f (diff) | |
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 <[email protected]>
Signed-off-by: Stefan Agner <[email protected]>
Reviewed-by: Fabio Estevam <[email protected]>
Tested-by: Joël Esponde <[email protected]>
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 2bedbdbf20c..b8817664870 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)}, |