Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 6106514f68af926e1dbb8d7820de1d5d923296a7

Authored by Ye Li
Committed by Peng Fan
1 parent de4f81cd40
Exists in smarc_8mq-imx_v2020.04_5.4.24_2.1.0 and in 1 other branch smarc_8mm-imx_v2020.04_5.4.24_2.1.0

MLK-18614-3 Xen: imx8qm_mek: Fix the CONFIG_FASTBOOT_USB_DEV and DTB issue 

Because the Xen u-boot is using OTG port not typec port, the CONFIG_FASTBOOT_USB_DEV
should set to 0 not 1. Otherwise the fastboot will fail.

Remove duplicated "/dts-v1/;" from Xen DTB.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit ceaa529b34752045dcd294572c30c7c56a48abe7)
(cherry picked from commit 2942cb192c0fff45307042bf60da08a30ccddaf2)
(cherry picked from commit 9e8b963dc74f54a781cdb495f24b9b6a669cd17e)
(cherry picked from commit 17fd71abdfa9895275be17ed9391fb8b68cd85ef)

Showing 2 changed files with 3 additions and 2 deletions Side-by-side Diff

arch/arm/dts/fsl-imx8qm-mek-xen.dts
Diff comments   View file @ 6106514
... ... @@ -12,8 +12,6 @@
12 12 * GNU General Public License for more details.
13 13 */
14 14  
15   -/dts-v1/;
16   -
17 15 #include "fsl-imx8qm-mek.dts"
18 16  
19 17 &usdhc1 {
include/configs/imx8qm_mek_android_auto_xen.h
Diff comments   View file @ 6106514
... ... @@ -29,6 +29,9 @@
29 29 #undef CONFIG_REQUIRE_SERIAL_CONSOLE
30 30 #undef CONFIG_IMX_SMMU
31 31  
  32 +#undef CONFIG_FASTBOOT_USB_DEV
  33 +#define CONFIG_FASTBOOT_USB_DEV 0 /* Use OTG port, not typec port */
  34 +
32 35 /* This needs to be stay same in iomem in domu.cfg */
33 36 #define SC_IPC_CH 0x15d1d0000
34 37