MA-11693-2 [Android]Support m4 image flash for imx7ulp and im8mq

Open configs to enable support m4 image flash for imx7ulp and im8mq.

Change-Id: I953e11ba5fe392f23d5477bf941b9b3a8530e368
Signed-off-by: Luo Ji <ji.luo@nxp.com>

diff --git a/configs/mx7ulp_evk_android_defconfig b/configs/mx7ulp_evk_android_defconfig
index f45975b..98e17a5 100644 (file)
--- a/configs/mx7ulp_evk_android_defconfig
+++ b/configs/mx7ulp_evk_android_defconfig
@@ -42,3 +42,4 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_MXC_USB_OTG_HACTIVE=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO=y
+CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y

diff --git a/configs/mx8mq_evk_android_defconfig b/configs/mx8mq_evk_android_defconfig
index 58383c0..6482f64 100644 (file)
--- a/configs/mx8mq_evk_android_defconfig
+++ b/configs/mx8mq_evk_android_defconfig
@@ -37,3 +37,4 @@ CONFIG_FIT=y
 CONFIG_SPL_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_LZ4=y
+CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y

diff --git a/include/configs/imx8mq_evk_android.h b/include/configs/imx8mq_evk_android.h
index ea19029..01bd1e6 100644 (file)
--- a/include/configs/imx8mq_evk_android.h
+++ b/include/configs/imx8mq_evk_android.h
@@ -51,4 +51,13 @@
        "fdt_high=0xffffffffffffffff\0"         \
        "initrd_high=0xffffffffffffffff\0"      \
 
+/* Enable mcu firmware flash */
+#ifdef CONFIG_FLASH_MCUFIRMWARE_SUPPORT
+#define ANDROID_MCU_FRIMWARE_DEV_TYPE DEV_MMC
+#define ANDROID_MCU_FIRMWARE_START 0x500000
+#define ANDROID_MCU_FIRMWARE_SIZE  0x40000
+#define ANDROID_MCU_FIRMWARE_HEADER_STACK 0x20020000
+#define ANDROID_MCU_FIRMWARE_HEADER_PC 0x1ffe0321
+#endif
+
 #endif /* IMX8MQ_EVK_ANDROID_H */

diff --git a/include/configs/mx7ulp_evk_android.h b/include/configs/mx7ulp_evk_android.h
index f94f34d..2e09547 100644 (file)
--- a/include/configs/mx7ulp_evk_android.h
+++ b/include/configs/mx7ulp_evk_android.h
@@ -31,4 +31,11 @@
 #define CONFIG_SYS_MALLOC_LEN           (96 * SZ_1M)
 #endif
 
+/* Enable mcu firmware flash */
+#ifdef CONFIG_FLASH_MCUFIRMWARE_SUPPORT
+#define ANDROID_MCU_FRIMWARE_DEV_TYPE DEV_SF
+#define ANDROID_MCU_FIRMWARE_START 0
+#define ANDROID_MCU_FIRMWARE_SIZE  0x4000000
+#endif
+
 #endif