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)

3 files changed, 146 insertions, 53 deletions

diff --git a/arch/arm/dts/fsl-imx8qm-mek-xen.dts b/arch/arm/dts/fsl-imx8qm-mek-xen.dts
index 880ccc6de3..e5a254130e 100644
--- a/arch/arm/dts/fsl-imx8qm-mek-xen.dts
+++ b/arch/arm/dts/fsl-imx8qm-mek-xen.dts
@@ -13,6 +13,7 @@
  */
 
 #include "fsl-imx8qm-mek.dts"
+#include "fsl-imx8qm-mek-u-boot.dtsi"
 
 &usdhc2 {
 	status = "disabled";
@@ -66,4 +67,9 @@
 	compatible = "xen,xen";
 	/delete-property/ power-domains;
 	u-boot,dm-pre-reloc;
+	u-boot,dm-spl;
+};
+
+&mu {
+	reg = <0x0 0x5d1d0000 0x0 0x10000>;
 };
diff --git a/configs/imx8qm_mek_androidauto_xen_defconfig b/configs/imx8qm_mek_androidauto_xen_defconfig
index 6775f3e6c4..2dee169573 100644
--- a/configs/imx8qm_mek_androidauto_xen_defconfig
+++ b/configs/imx8qm_mek_androidauto_xen_defconfig
@@ -1,65 +1,145 @@
 CONFIG_ARM=y
+CONFIG_SPL_SYS_ICACHE_OFF=y
+CONFIG_SPL_SYS_DCACHE_OFF=y
 CONFIG_ARCH_IMX8=y
-CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-xen"
-CONFIG_SYS_EXTRA_OPTIONS="ANDROID_AUTO_SUPPORT"
+CONFIG_SYS_TEXT_BASE=0x81080000
+CONFIG_SPL_TEXT_BASE=0x80080000
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SYS_MALLOC_F_LEN=0x8000
+CONFIG_ENV_SIZE=0x2000
+CONFIG_ENV_OFFSET=0x400000
+CONFIG_DM_GPIO=y
+CONFIG_SPL_LOAD_IMX_CONTAINER=y
+CONFIG_IMX_CONTAINER_CFG="board/freescale/imx8qm_mek/uboot-container.cfg"
 CONFIG_TARGET_IMX8QM_MEK=y
-CONFIG_SYS_TEXT_BASE=0x80080000
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_SPL_EFI_PARTITION=y
+CONFIG_SPL_DOS_PARTITION=n
+CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_USE_TINY_PRINTF=n
+CONFIG_NR_DRAM_BANKS=4
+CONFIG_SPL=y
+CONFIG_PANIC_HANG=y
+CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg,ANDROID_AUTO_SUPPORT"
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_XEN=y
+CONFIG_BOOTDELAY=1
+CONFIG_LOG=y
+CONFIG_SPL_BOARD_INIT=y
+CONFIG_SPL_USE_TINY_PRINTF=n
+# CONFIG_SPL_SYS_MALLOC_SIMPLE is not set
+CONFIG_SPL_SEPARATE_BSS=y
+CONFIG_SPL_POWER_SUPPORT=y
+CONFIG_SPL_POWER_DOMAIN=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_CPU=y
+# CONFIG_BOOTM_NETBSD is not set
+# CONFIG_CMD_IMPORTENV is not set
+CONFIG_CMD_CLK=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=n
+CONFIG_CMD_MMC=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_FAT=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-xen"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SPL_DM=y
+CONFIG_MU_BASE_SPL=0x5d1d0000
+CONFIG_SPL_CLK=y
+CONFIG_CLK_IMX8=y
+CONFIG_CPU=y
+CONFIG_MXC_GPIO=y
+CONFIG_DM_PCA953X=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_IMX_LPI2C=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
+CONFIG_MISC=y
+CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
+CONFIG_FSL_USDHC=y
+CONFIG_MMC_IO_VOLTAGE=y
+CONFIG_MMC_UHS_SUPPORT=y
+CONFIG_MMC_HS400_SUPPORT=y
 CONFIG_EFI_PARTITION=y
-CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_DM=y
-CONFIG_DM_WARN=n
-CONFIG_DM_DEVICE_REMOVE=n
-
+CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_PINCTRL_IMX8=y
+CONFIG_POWER_DOMAIN=y
+CONFIG_IMX8_POWER_DOMAIN=y
+CONFIG_DM_REGULATOR=y
+CONFIG_SPL_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_SPL_DM_REGULATOR_FIXED=y
 CONFIG_DM_SERIAL=y
 CONFIG_FSL_LPUART=n
-CONFIG_OF_CONTROL=y
-CONFIG_DM_I2C=n
-# CONFIG_DM_I2C_COMPAT is not set
-CONFIG_SYS_I2C_IMX_LPI2C=n
-CONFIG_CMD_I2C=n
+CONFIG_SPL_TINY_MEMSET=y
+# CONFIG_EFI_LOADER is not set
 
+CONFIG_CMD_FUSE=y
+CONFIG_CMD_MEMTEST=y
+
+CONFIG_DM_THERMAL=n
+CONFIG_IMX_SC_THERMAL=n
+CONFIG_SPI=y
+CONFIG_FSL_FSPI=y
+CONFIG_DM_SPI=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_CMD_SF=y
+CONFIG_SF_DEFAULT_BUS=0
+CONFIG_SF_DEFAULT_CS=0
+CONFIG_SF_DEFAULT_SPEED=40000000
+CONFIG_SF_DEFAULT_MODE=0
 CONFIG_USB_XHCI_HCD=n
 CONFIG_USB_XHCI_IMX8=n
 
 CONFIG_DM_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_CMD_USB=y
+CONFIG_DM_USB_GADGET=y
+CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB=y
-CONFIG_USB_TCPC=n
 
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
-CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
-CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
-
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_USB_CDNS3=n
 CONFIG_USB_CDNS3_GADGET=n
 CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_PHY=y
+CONFIG_SPL_PHY=y
 
-CONFIG_DM_GPIO=n
-CONFIG_DM_PCA953X=n
-CONFIG_BOOTDELAY=1
-CONFIG_CMD_MMC=y
-CONFIG_DM_MMC=y
-CONFIG_MMC_IO_VOLTAGE=y
-CONFIG_MMC_UHS_SUPPORT=y
-CONFIG_MMC_HS400_SUPPORT=y
-CONFIG_FSL_FSPI=n
-CONFIG_DM_SPI=n
-CONFIG_DM_SPI_FLASH=n
-CONFIG_SPI_FLASH=n
-CONFIG_SPI_FLASH_4BYTES_ADDR=n
-CONFIG_SPI_FLASH_STMICRO=n
+CONFIG_SPL_USB_GADGET=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_SDP_USB_DEV=1
+CONFIG_SDP_LOADADDR=0x80400000
 
-CONFIG_DM_REGULATOR=y
-CONFIG_DM_REGULATOR_FIXED=n
-CONFIG_DM_REGULATOR_GPIO=n
-
-CONFIG_PINCTRL=y
-CONFIG_PINCTRL_IMX8=y
+CONFIG_FASTBOOT=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_CMD_FASTBOOT=y
+CONFIG_ANDROID_BOOT_IMAGE=y
+CONFIG_FASTBOOT_UUU_SUPPORT=n
+CONFIG_FASTBOOT_BUF_ADDR=0x98000000
+CONFIG_FASTBOOT_BUF_SIZE=0x19000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_USB_DEV=1
+CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
+CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000
 
+CONFIG_NET=n
 CONFIG_CMD_NET=n
 CONFIG_CMD_NFS=n
 CONFIG_CMD_BDI=n
@@ -74,10 +154,8 @@ CONFIG_CMD_IMI=n
 CONFIG_CMD_IMLS=n
 CONFIG_CMD_XIMG=n
 CONFIG_CMD_EXPORTENV=n
-CONFIG_CMD_IMPORTENV=n
 CONFIG_CMD_EDITENV=n
 CONFIG_CMD_ENV_EXISTS=n
-CONFIG_CMD_MEMORY=n
 CONFIG_CMD_CRC32=n
 CONFIG_CMD_DM=n
 CONFIG_CMD_LOADB=n
@@ -90,19 +168,32 @@ CONFIG_CMD_ITEST=n
 CONFIG_CMD_SOURCE=n
 CONFIG_CMD_SETEXPR=n
 CONFIG_CMD_MISC=n
+CONFIG_CMD_UNZIP=n
+CONFIG_CMD_LZMADEC=n
+CONFIG_CMD_SAVEENV=n
 
 CONFIG_DISPLAY_CPUINFO=n
 CONFIG_DISPLAY_BOARDINFO=n
-CONFIG_EFI_LOADER=n
-
-CONFIG_POWER_DOMAIN=y
-CONFIG_IMX8_POWER_DOMAIN=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 
-CONFIG_DM_THERMAL=n
-CONFIG_IMX_SC_THERMAL=n
-
-CONFIG_ENV_IS_IN_MMC=y
 CONFIG_LZ4=y
+CONFIG_BCB_SUPPORT=y
+CONFIG_ANDROID_RECOVERY=y
+CONFIG_SUPPORT_RAW_INITRD=y
+CONFIG_FSL_FASTBOOT=y
+CONFIG_FASTBOOT_LOCK=y
+CONFIG_CMD_BOOTA=y
+CONFIG_LIBAVB=y
+CONFIG_AVB_SUPPORT=y
+CONFIG_APPEND_BOOTARGS=y
+CONFIG_SHA256=y
+CONFIG_CMD_MMC_RPMB=y
+CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_IMX_TRUSTY_OS=n
+CONFIG_TRUSTY_UNLOCK_PERMISSION=y
+CONFIG_DUAL_BOOTLOADER=y
+CONFIG_SPL_MMC_WRITE=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_XEN=y
 CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y
 CONFIG_XEN_DEBUG_SERIAL=y
diff --git a/include/configs/imx8qm_mek_android_auto_xen.h b/include/configs/imx8qm_mek_android_auto_xen.h
index 68f8eb86a0..3d99eae1a1 100644
--- a/include/configs/imx8qm_mek_android_auto_xen.h
+++ b/include/configs/imx8qm_mek_android_auto_xen.h
@@ -32,9 +32,6 @@
 #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			0x5d1d0000
-
 #ifdef CONFIG_SPL_BUILD
 #undef CONFIG_SPL_BSS_START_ADDR
 #undef CONFIG_SYS_SPL_MALLOC_START
@@ -42,7 +39,6 @@
 #undef CONFIG_SPL_TEXT_BASE
 #undef CONFIG_SPL_STACK
 
-#define CONFIG_SPL_TEXT_BASE		0x80080000
 #define CONFIG_MALLOC_F_ADDR		0x80100000
 #define CONFIG_SYS_SPL_MALLOC_START	0x80200000
 #define CONFIG_SPL_BSS_START_ADDR	0x80300000