Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 8f53e8699dcbae29a408b41b0fad71ce99c50ff1

Authored by Peng Fan
1 parent 34b5b76b42
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-24172-1 imx8qm: update xen defconfig/dts for 2020.04 

Update xen defconfig
Update dts to let xen serial could be used in early stage,
but seems without mmu enabled, it output nothing. It only
output data after mmu enabled.

Reviewed-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit c1ac080ab69b27e4a66aaf10a9b801d2a3c7b8d0)

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

arch/arm/dts/fsl-imx8qm-mek-xen.dts
Diff comments   View file @ 8f53e86
... ... @@ -13,6 +13,7 @@
13 13 */
14 14  
15 15 #include "fsl-imx8qm-mek.dts"
  16 +#include "fsl-imx8qm-mek-u-boot.dtsi"
16 17  
17 18 &usdhc2 {
18 19 status = "disabled";
... ... @@ -66,5 +67,10 @@
66 67 compatible = "xen,xen";
67 68 /delete-property/ power-domains;
68 69 u-boot,dm-pre-reloc;
  70 + u-boot,dm-spl;
  71 +};
  72 +
  73 +&mu {
  74 + reg = <0x0 0x5d1d0000 0x0 0x10000>;
69 75 };
configs/imx8qm_mek_androidauto_xen_defconfig
Diff comments   View file @ 8f53e86
1 1 CONFIG_ARM=y
  2 +CONFIG_SPL_SYS_ICACHE_OFF=y
  3 +CONFIG_SPL_SYS_DCACHE_OFF=y
2 4 CONFIG_ARCH_IMX8=y
3   -CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-xen"
4   -CONFIG_SYS_EXTRA_OPTIONS="ANDROID_AUTO_SUPPORT"
  5 +CONFIG_SYS_TEXT_BASE=0x81080000
  6 +CONFIG_SPL_TEXT_BASE=0x80080000
  7 +CONFIG_SPL_GPIO_SUPPORT=y
  8 +CONFIG_SPL_LIBCOMMON_SUPPORT=y
  9 +CONFIG_SPL_LIBGENERIC_SUPPORT=y
  10 +CONFIG_SYS_MALLOC_F_LEN=0x8000
  11 +CONFIG_ENV_SIZE=0x2000
  12 +CONFIG_ENV_OFFSET=0x400000
  13 +CONFIG_DM_GPIO=y
  14 +CONFIG_SPL_LOAD_IMX_CONTAINER=y
  15 +CONFIG_IMX_CONTAINER_CFG="board/freescale/imx8qm_mek/uboot-container.cfg"
5 16 CONFIG_TARGET_IMX8QM_MEK=y
6   -CONFIG_SYS_TEXT_BASE=0x80080000
  17 +CONFIG_SPL_MMC_SUPPORT=y
  18 +CONFIG_SPL_EFI_PARTITION=y
  19 +CONFIG_SPL_DOS_PARTITION=n
  20 +CONFIG_SPL_DM_SEQ_ALIAS=y
  21 +CONFIG_SPL_SERIAL_SUPPORT=y
  22 +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
  23 +CONFIG_USE_TINY_PRINTF=n
  24 +CONFIG_NR_DRAM_BANKS=4
  25 +CONFIG_SPL=y
  26 +CONFIG_PANIC_HANG=y
  27 +CONFIG_OF_SYSTEM_SETUP=y
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg,ANDROID_AUTO_SUPPORT"
  29 +CONFIG_DEBUG_UART=y
  30 +CONFIG_DEBUG_UART_XEN=y
  31 +CONFIG_BOOTDELAY=1
  32 +CONFIG_LOG=y
  33 +CONFIG_SPL_BOARD_INIT=y
  34 +CONFIG_SPL_USE_TINY_PRINTF=n
  35 +# CONFIG_SPL_SYS_MALLOC_SIMPLE is not set
  36 +CONFIG_SPL_SEPARATE_BSS=y
  37 +CONFIG_SPL_POWER_SUPPORT=y
  38 +CONFIG_SPL_POWER_DOMAIN=y
  39 +CONFIG_SPL_WATCHDOG_SUPPORT=y
  40 +CONFIG_HUSH_PARSER=y
  41 +CONFIG_CMD_CPU=y
  42 +# CONFIG_BOOTM_NETBSD is not set
  43 +# CONFIG_CMD_IMPORTENV is not set
  44 +CONFIG_CMD_CLK=y
  45 +CONFIG_CMD_GPIO=y
  46 +CONFIG_CMD_I2C=n
  47 +CONFIG_CMD_MMC=y
  48 +CONFIG_CMD_DHCP=y
  49 +CONFIG_CMD_PING=y
  50 +CONFIG_CMD_CACHE=y
  51 +CONFIG_CMD_FAT=y
  52 +CONFIG_SPL_OF_CONTROL=y
  53 +CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-xen"
  54 +CONFIG_ENV_IS_IN_MMC=y
  55 +CONFIG_SPL_DM=y
  56 +CONFIG_MU_BASE_SPL=0x5d1d0000
  57 +CONFIG_SPL_CLK=y
  58 +CONFIG_CLK_IMX8=y
  59 +CONFIG_CPU=y
  60 +CONFIG_MXC_GPIO=y
  61 +CONFIG_DM_PCA953X=y
  62 +CONFIG_DM_I2C=y
  63 +CONFIG_SYS_I2C_IMX_LPI2C=y
  64 +CONFIG_I2C_MUX=y
  65 +CONFIG_I2C_MUX_PCA954x=y
  66 +CONFIG_MISC=y
  67 +CONFIG_DM_MMC=y
  68 +CONFIG_SUPPORT_EMMC_BOOT=y
  69 +CONFIG_FSL_USDHC=y
  70 +CONFIG_MMC_IO_VOLTAGE=y
  71 +CONFIG_MMC_UHS_SUPPORT=y
  72 +CONFIG_MMC_HS400_SUPPORT=y
7 73 CONFIG_EFI_PARTITION=y
8   -CONFIG_SYS_MALLOC_F_LEN=0x2000
9   -CONFIG_DM=y
10   -CONFIG_DM_WARN=n
11   -CONFIG_DM_DEVICE_REMOVE=n
12   -
  74 +CONFIG_PINCTRL=y
  75 +CONFIG_SPL_PINCTRL=y
  76 +CONFIG_PINCTRL_IMX8=y
  77 +CONFIG_POWER_DOMAIN=y
  78 +CONFIG_IMX8_POWER_DOMAIN=y
  79 +CONFIG_DM_REGULATOR=y
  80 +CONFIG_SPL_DM_REGULATOR=y
  81 +CONFIG_DM_REGULATOR_FIXED=y
  82 +CONFIG_DM_REGULATOR_GPIO=y
  83 +CONFIG_SPL_DM_REGULATOR_FIXED=y
13 84 CONFIG_DM_SERIAL=y
14 85 CONFIG_FSL_LPUART=n
15   -CONFIG_OF_CONTROL=y
16   -CONFIG_DM_I2C=n
17   -# CONFIG_DM_I2C_COMPAT is not set
18   -CONFIG_SYS_I2C_IMX_LPI2C=n
19   -CONFIG_CMD_I2C=n
  86 +CONFIG_SPL_TINY_MEMSET=y
  87 +# CONFIG_EFI_LOADER is not set
20 88  
  89 +CONFIG_CMD_FUSE=y
  90 +CONFIG_CMD_MEMTEST=y
  91 +
  92 +CONFIG_DM_THERMAL=n
  93 +CONFIG_IMX_SC_THERMAL=n
  94 +CONFIG_SPI=y
  95 +CONFIG_FSL_FSPI=y
  96 +CONFIG_DM_SPI=y
  97 +CONFIG_DM_SPI_FLASH=y
  98 +CONFIG_SPI_FLASH=y
  99 +CONFIG_SPI_FLASH_STMICRO=y
  100 +CONFIG_CMD_SF=y
  101 +CONFIG_SF_DEFAULT_BUS=0
  102 +CONFIG_SF_DEFAULT_CS=0
  103 +CONFIG_SF_DEFAULT_SPEED=40000000
  104 +CONFIG_SF_DEFAULT_MODE=0
21 105 CONFIG_USB_XHCI_HCD=n
22 106 CONFIG_USB_XHCI_IMX8=n
23 107  
24 108 CONFIG_DM_USB=y
25   -CONFIG_USB_EHCI_HCD=y
26   -CONFIG_CMD_USB=y
  109 +CONFIG_DM_USB_GADGET=y
  110 +CONFIG_SPL_DM_USB_GADGET=y
27 111 CONFIG_USB=y
28   -CONFIG_USB_TCPC=n
29 112  
30 113 CONFIG_USB_GADGET=y
31 114 CONFIG_CI_UDC=y
32 115 CONFIG_USB_GADGET_DOWNLOAD=y
33 116 CONFIG_USB_GADGET_MANUFACTURER="FSL"
34   -CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
35   -CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
36   -
  117 +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  118 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
37 119 CONFIG_USB_CDNS3=n
38 120 CONFIG_USB_CDNS3_GADGET=n
39 121 CONFIG_USB_GADGET_DUALSPEED=y
  122 +CONFIG_PHY=y
  123 +CONFIG_SPL_PHY=y
40 124  
41   -CONFIG_DM_GPIO=n
42   -CONFIG_DM_PCA953X=n
43   -CONFIG_BOOTDELAY=1
44   -CONFIG_CMD_MMC=y
45   -CONFIG_DM_MMC=y
46   -CONFIG_MMC_IO_VOLTAGE=y
47   -CONFIG_MMC_UHS_SUPPORT=y
48   -CONFIG_MMC_HS400_SUPPORT=y
49   -CONFIG_FSL_FSPI=n
50   -CONFIG_DM_SPI=n
51   -CONFIG_DM_SPI_FLASH=n
52   -CONFIG_SPI_FLASH=n
53   -CONFIG_SPI_FLASH_4BYTES_ADDR=n
54   -CONFIG_SPI_FLASH_STMICRO=n
  125 +CONFIG_SPL_USB_GADGET=y
  126 +CONFIG_SPL_USB_SDP_SUPPORT=y
  127 +CONFIG_SPL_SDP_USB_DEV=1
  128 +CONFIG_SDP_LOADADDR=0x80400000
55 129  
56   -CONFIG_DM_REGULATOR=y
57   -CONFIG_DM_REGULATOR_FIXED=n
58   -CONFIG_DM_REGULATOR_GPIO=n
  130 +CONFIG_FASTBOOT=y
  131 +CONFIG_USB_FUNCTION_FASTBOOT=y
  132 +CONFIG_CMD_FASTBOOT=y
  133 +CONFIG_ANDROID_BOOT_IMAGE=y
  134 +CONFIG_FASTBOOT_UUU_SUPPORT=n
  135 +CONFIG_FASTBOOT_BUF_ADDR=0x98000000
  136 +CONFIG_FASTBOOT_BUF_SIZE=0x19000000
  137 +CONFIG_FASTBOOT_FLASH=y
  138 +CONFIG_FASTBOOT_USB_DEV=1
  139 +CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
  140 +CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000
59 141  
60   -CONFIG_PINCTRL=y
61   -CONFIG_PINCTRL_IMX8=y
62   -
  142 +CONFIG_NET=n
63 143 CONFIG_CMD_NET=n
64 144 CONFIG_CMD_NFS=n
65 145 CONFIG_CMD_BDI=n
66 146  
... ... @@ -74,10 +154,8 @@
74 154 CONFIG_CMD_IMLS=n
75 155 CONFIG_CMD_XIMG=n
76 156 CONFIG_CMD_EXPORTENV=n
77   -CONFIG_CMD_IMPORTENV=n
78 157 CONFIG_CMD_EDITENV=n
79 158 CONFIG_CMD_ENV_EXISTS=n
80   -CONFIG_CMD_MEMORY=n
81 159 CONFIG_CMD_CRC32=n
82 160 CONFIG_CMD_DM=n
83 161 CONFIG_CMD_LOADB=n
84 162  
85 163  
86 164  
... ... @@ -90,19 +168,32 @@
90 168 CONFIG_CMD_SOURCE=n
91 169 CONFIG_CMD_SETEXPR=n
92 170 CONFIG_CMD_MISC=n
  171 +CONFIG_CMD_UNZIP=n
  172 +CONFIG_CMD_LZMADEC=n
  173 +CONFIG_CMD_SAVEENV=n
93 174  
94 175 CONFIG_DISPLAY_CPUINFO=n
95 176 CONFIG_DISPLAY_BOARDINFO=n
96   -CONFIG_EFI_LOADER=n
  177 +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
97 178  
98   -CONFIG_POWER_DOMAIN=y
99   -CONFIG_IMX8_POWER_DOMAIN=y
100   -
101   -CONFIG_DM_THERMAL=n
102   -CONFIG_IMX_SC_THERMAL=n
103   -
104   -CONFIG_ENV_IS_IN_MMC=y
105 179 CONFIG_LZ4=y
  180 +CONFIG_BCB_SUPPORT=y
  181 +CONFIG_ANDROID_RECOVERY=y
  182 +CONFIG_SUPPORT_RAW_INITRD=y
  183 +CONFIG_FSL_FASTBOOT=y
  184 +CONFIG_FASTBOOT_LOCK=y
  185 +CONFIG_CMD_BOOTA=y
  186 +CONFIG_LIBAVB=y
  187 +CONFIG_AVB_SUPPORT=y
  188 +CONFIG_APPEND_BOOTARGS=y
  189 +CONFIG_SHA256=y
  190 +CONFIG_CMD_MMC_RPMB=y
  191 +CONFIG_SUPPORT_EMMC_RPMB=y
  192 +CONFIG_IMX_TRUSTY_OS=n
  193 +CONFIG_TRUSTY_UNLOCK_PERMISSION=y
  194 +CONFIG_DUAL_BOOTLOADER=y
  195 +CONFIG_SPL_MMC_WRITE=y
  196 +CONFIG_SPL_LIBDISK_SUPPORT=y
106 197 CONFIG_XEN=y
107 198 CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y
108 199 CONFIG_XEN_DEBUG_SERIAL=y
include/configs/imx8qm_mek_android_auto_xen.h
Diff comments   View file @ 8f53e86
... ... @@ -32,9 +32,6 @@
32 32 #undef CONFIG_FASTBOOT_USB_DEV
33 33 #define CONFIG_FASTBOOT_USB_DEV 0 /* Use OTG port, not typec port */
34 34  
35   -/* This needs to be stay same in iomem in domu.cfg */
36   -#define SC_IPC_CH 0x5d1d0000
37   -
38 35 #ifdef CONFIG_SPL_BUILD
39 36 #undef CONFIG_SPL_BSS_START_ADDR
40 37 #undef CONFIG_SYS_SPL_MALLOC_START
... ... @@ -42,7 +39,6 @@
42 39 #undef CONFIG_SPL_TEXT_BASE
43 40 #undef CONFIG_SPL_STACK
44 41  
45   -#define CONFIG_SPL_TEXT_BASE 0x80080000
46 42 #define CONFIG_MALLOC_F_ADDR 0x80100000
47 43 #define CONFIG_SYS_SPL_MALLOC_START 0x80200000
48 44 #define CONFIG_SPL_BSS_START_ADDR 0x80300000