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 Inline Diff

arch/arm/dts/fsl-imx8qm-mek-xen.dts
Diff comments   View file @ 6106514
1 /* 1 /*
2 * Copyright 2018 NXP 2 * Copyright 2018 NXP
3 * 3 *
4 * This program is free software; you can redistribute it and/or 4 * This program is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU General Public License 5 * modify it under the terms of the GNU General Public License
6 * as published by the Free Software Foundation; either version 2 6 * as published by the Free Software Foundation; either version 2
7 * of the License, or (at your option) any later version. 7 * of the License, or (at your option) any later version.
8 * 8 *
9 * This program is distributed in the hope that it will be useful, 9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 */ 13 */
14 14
15 /dts-v1/;
16
17 #include "fsl-imx8qm-mek.dts" 15 #include "fsl-imx8qm-mek.dts"
18 16
19 &usdhc1 { 17 &usdhc1 {
20 /* Need to be same as iomem for sdhc1 in domu.cfg */ 18 /* Need to be same as iomem for sdhc1 in domu.cfg */
21 reg = <0x1 0x5b010000 0x0 0x10000>; 19 reg = <0x1 0x5b010000 0x0 0x10000>;
22 }; 20 };
23 21
24 &usdhc2 { 22 &usdhc2 {
25 /* Need to be same as iomem for sdhc2 in domu.cfg */ 23 /* Need to be same as iomem for sdhc2 in domu.cfg */
26 reg = <0x1 0x5b020000 0x0 0x10000>; 24 reg = <0x1 0x5b020000 0x0 0x10000>;
27 status = "disabled"; 25 status = "disabled";
28 }; 26 };
29 27
30 &gpio2 { 28 &gpio2 {
31 status = "disabled"; 29 status = "disabled";
32 }; 30 };
33 31
34 &gpio4 { 32 &gpio4 {
35 status = "disabled"; 33 status = "disabled";
36 }; 34 };
37 35
38 &gpio5 { 36 &gpio5 {
39 status = "disabled"; 37 status = "disabled";
40 }; 38 };
41 39
42 &usbotg3 { 40 &usbotg3 {
43 status = "disabled"; 41 status = "disabled";
44 }; 42 };
45 43
46 &fec1 { 44 &fec1 {
47 status = "disabled"; 45 status = "disabled";
48 }; 46 };
49 47
50 &fec2 { 48 &fec2 {
51 status = "disabled"; 49 status = "disabled";
52 }; 50 };
53 51
54 &flexspi0 { 52 &flexspi0 {
55 status = "disabled"; 53 status = "disabled";
56 }; 54 };
57 55
58 &i2c0 { 56 &i2c0 {
59 status = "disabled"; 57 status = "disabled";
60 }; 58 };
61 59
62 &i2c1_lvds0 { 60 &i2c1_lvds0 {
63 status = "disabled"; 61 status = "disabled";
64 }; 62 };
65 63
66 &i2c1_lvds1 { 64 &i2c1_lvds1 {
67 status = "disabled"; 65 status = "disabled";
68 }; 66 };
69 67
70 &lpspi0 { 68 &lpspi0 {
71 status = "disabled"; 69 status = "disabled";
72 }; 70 };
73 71
74 &lpuart0 { 72 &lpuart0 {
75 status = "disabled"; 73 status = "disabled";
76 }; 74 };
77 75
include/configs/imx8qm_mek_android_auto_xen.h
Diff comments   View file @ 6106514
1 /* 1 /*
2 * Copyright 2018 NXP 2 * Copyright 2018 NXP
3 * 3 *
4 * SPDX-License-Identifier: GPL-2.0+ 4 * SPDX-License-Identifier: GPL-2.0+
5 */ 5 */
6 6
7 #ifndef IMX8QM_MEK_ANDROID_AUTO_XEN_H 7 #ifndef IMX8QM_MEK_ANDROID_AUTO_XEN_H
8 #define IMX8QM_MEK_ANDROID_AUTO_XEN_H 8 #define IMX8QM_MEK_ANDROID_AUTO_XEN_H
9 9
10 #undef CONFIG_SYS_SDRAM_BASE 10 #undef CONFIG_SYS_SDRAM_BASE
11 #undef CONFIG_NR_DRAM_BANKS 11 #undef CONFIG_NR_DRAM_BANKS
12 #undef PHYS_SDRAM_1 12 #undef PHYS_SDRAM_1
13 #undef PHYS_SDRAM_2 13 #undef PHYS_SDRAM_2
14 #undef PHYS_SDRAM_1_SIZE 14 #undef PHYS_SDRAM_1_SIZE
15 #undef PHYS_SDRAM_2_SIZE 15 #undef PHYS_SDRAM_2_SIZE
16 16
17 #define CONFIG_SYS_SDRAM_BASE 0x40000000 17 #define CONFIG_SYS_SDRAM_BASE 0x40000000
18 #define CONFIG_NR_DRAM_BANKS 2 18 #define CONFIG_NR_DRAM_BANKS 2
19 #define PHYS_SDRAM_1 0x40000000 19 #define PHYS_SDRAM_1 0x40000000
20 #define PHYS_SDRAM_2 0x200000000 20 #define PHYS_SDRAM_2 0x200000000
21 #define PHYS_SDRAM_1_SIZE 0xC0000000 /* 3 GB */ 21 #define PHYS_SDRAM_1_SIZE 0xC0000000 /* 3 GB */
22 #define PHYS_SDRAM_2_SIZE 0x20000000 /* 512 MB */ 22 #define PHYS_SDRAM_2_SIZE 0x20000000 /* 512 MB */
23 23
24 #undef CONFIG_LOADADDR 24 #undef CONFIG_LOADADDR
25 #define CONFIG_LOADADDR 0x40280000 25 #define CONFIG_LOADADDR 0x40280000
26 #undef CONFIG_SYS_INIT_SP_ADDR 26 #undef CONFIG_SYS_INIT_SP_ADDR
27 #define CONFIG_SYS_INIT_SP_ADDR 0x40200000 27 #define CONFIG_SYS_INIT_SP_ADDR 0x40200000
28 28
29 #undef CONFIG_REQUIRE_SERIAL_CONSOLE 29 #undef CONFIG_REQUIRE_SERIAL_CONSOLE
30 #undef CONFIG_IMX_SMMU 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 /* This needs to be stay same in iomem in domu.cfg */ 35 /* This needs to be stay same in iomem in domu.cfg */
33 #define SC_IPC_CH 0x15d1d0000 36 #define SC_IPC_CH 0x15d1d0000
34 37
35 #endif /* IMX8QM_MEK_ANDROID_AUTO_XEN_H */ 38 #endif /* IMX8QM_MEK_ANDROID_AUTO_XEN_H */
36 39