summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2018-06-14 19:04:36 -0700
committerYe Li <ye.li@nxp.com>2022-04-06 18:04:21 +0800
commit2e73d881133a93bcbb2013bd4e4075fdbd11bce8 (patch)
tree2d785862db64f3404f0449af0f025cb090ba325d
parent2818db49471dfd8739504b9e5723fcd96ca72800 (diff)
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 be348f08fca7620698ec7fea3d94f7b95485aa2c) (cherry picked from commit 0930d8f55ca4784cddb2b0726b1d89f3632f7119) (cherry picked from commit 417cfc84dfc7d8628faf7570454c65b683ee5b78)
-rw-r--r--arch/arm/dts/fsl-imx8qm-mek-xen.dts2
-rw-r--r--include/configs/imx8qm_mek_android_auto_xen.h3
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 7c9703b92f4..f812b34a995 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 0cf548f2fd6..62d94ce769e 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