MA-14318-1 Support dual bootloader for xen

Trusty is not supported for xen so we don't need to check
the keyslot package or rollback index in spl. Reassign the
dram address for spl and u-boot to avoid conflicts.

Support serial init functions to enable debug console
in spl when xen is running.

Test: Boot and A/B slot switch on imx8qm_mek.

Change-Id: If6829252f1ec2e32255f951715c8747181951fd0
Signed-off-by: Ji Luo <ji.luo@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 30beee3fe6d4b35166c6e17203909231d33bc2db)
(cherry picked from commit a4ffa905d90d14ccdd146e4b38a69d40a568b747)
(cherry picked from commit ca5e676b7a7c5ea7b435cb05eba180f3a25e5335)

diff --git a/include/configs/imx8qm_mek_android_auto_xen.h b/include/configs/imx8qm_mek_android_auto_xen.h
index 2fdff1f..68f8eb8 100644 (file)
--- a/include/configs/imx8qm_mek_android_auto_xen.h
+++ b/include/configs/imx8qm_mek_android_auto_xen.h
@@ -24,7 +24,7 @@
 #undef CONFIG_LOADADDR
 #define CONFIG_LOADADDR                        0x80080000
 #undef CONFIG_SYS_INIT_SP_ADDR
-#define CONFIG_SYS_INIT_SP_ADDR                0x80200000
+#define CONFIG_SYS_INIT_SP_ADDR                0x81200000
 
 #undef CONFIG_REQUIRE_SERIAL_CONSOLE
 #undef CONFIG_IMX_SMMU
@@ -35,4 +35,22 @@
 /* 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
+#undef CONFIG_MALLOC_F_ADDR
+#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
+#define CONFIG_SPL_STACK               0x80400000
+
+#define CONFIG_SYS_SPL_PTE_RAM_BASE    0x80500000
+#endif
+
+#define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED
+
 #endif /* IMX8QM_MEK_ANDROID_AUTO_XEN_H */