From 6106514f68af926e1dbb8d7820de1d5d923296a7 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Thu, 14 Jun 2018 19:04:36 -0700 Subject: [PATCH] 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 (cherry picked from commit ceaa529b34752045dcd294572c30c7c56a48abe7) (cherry picked from commit 2942cb192c0fff45307042bf60da08a30ccddaf2) (cherry picked from commit 9e8b963dc74f54a781cdb495f24b9b6a669cd17e) (cherry picked from commit 17fd71abdfa9895275be17ed9391fb8b68cd85ef) --- arch/arm/dts/fsl-imx8qm-mek-xen.dts | 2 -- include/configs/imx8qm_mek_android_auto_xen.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/fsl-imx8qm-mek-xen.dts b/arch/arm/dts/fsl-imx8qm-mek-xen.dts index 7c9703b..f812b34 100644 --- a/arch/arm/dts/fsl-imx8qm-mek-xen.dts +++ b/arch/arm/dts/fsl-imx8qm-mek-xen.dts @@ -12,8 +12,6 @@ * GNU General Public License for more details. */ -/dts-v1/; - #include "fsl-imx8qm-mek.dts" &usdhc1 { diff --git a/include/configs/imx8qm_mek_android_auto_xen.h b/include/configs/imx8qm_mek_android_auto_xen.h index 0cf548f..62d94ce 100644 --- a/include/configs/imx8qm_mek_android_auto_xen.h +++ b/include/configs/imx8qm_mek_android_auto_xen.h @@ -29,6 +29,9 @@ #undef CONFIG_REQUIRE_SERIAL_CONSOLE #undef CONFIG_IMX_SMMU +#undef CONFIG_FASTBOOT_USB_DEV +#define CONFIG_FASTBOOT_USB_DEV 0 /* Use OTG port, not typec port */ + /* This needs to be stay same in iomem in domu.cfg */ #define SC_IPC_CH 0x15d1d0000 -- 1.9.1