MLK-20760-1 mx6/7: Fix memory overlap between initrd and optee

On most of mx6 and mx7 platforms, we set the initrd address to 0x3800000
offset from DRAM base. However, the optee address is 0x4000000 offset from
DRAM base. So it will cause memory overlap when using initramfs and optee at
same time, for example using uuu to boot into kernel.

To fix the conflict, we set initrd address to 0x6680000 offset from DRAM base,
because OPTEE needs reserve 32MB memory from 0x4000000 offset to 0x6000000 offset.

Signed-off-by: Ye Li <ye.li@nxp.com>

13 files changed, 13 insertions, 13 deletions

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 9e3645d877..e843549173 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -66,7 +66,7 @@
 
 #define CONFIG_MFG_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS_DEFAULT \
-	"initrd_addr=0x83800000\0" \
+	"initrd_addr=0x86800000\0" \
 	"initrd_high=0xffffffff\0" \
     "emmc_dev=2\0"\
     "sd_dev=1\0" \
diff --git a/include/configs/mx6sll_arm2.h b/include/configs/mx6sll_arm2.h
index 8b6a26f147..8bc7ae42ec 100644
--- a/include/configs/mx6sll_arm2.h
+++ b/include/configs/mx6sll_arm2.h
@@ -51,7 +51,7 @@
 		"g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
 		"g_mass_storage.iSerialNumber=\"\" "\
 		"\0" \
-	"initrd_addr=0x83800000\0" \
+	"initrd_addr=0x86800000\0" \
 	"initrd_high=0xffffffff\0" \
 	"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 
diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index 948f44eb37..4df66f9b94 100644
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -39,7 +39,7 @@
 
 #define CONFIG_MFG_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS_DEFAULT \
-	"initrd_addr=0x83800000\0" \
+	"initrd_addr=0x86800000\0" \
 	"initrd_high=0xffffffff\0" \
     "emmc_dev=1\0"\
     "sd_dev=0\0" \
diff --git a/include/configs/mx6sx_arm2.h b/include/configs/mx6sx_arm2.h
index f8e01d86f1..9c16748cd6 100644
--- a/include/configs/mx6sx_arm2.h
+++ b/include/configs/mx6sx_arm2.h
@@ -101,7 +101,7 @@
 		"g_mass_storage.iSerialNumber=\"\" "\
 		MFG_NAND_PARTITION \
 		"\0" \
-	"initrd_addr=0x83800000\0" \
+	"initrd_addr=0x86800000\0" \
 	"initrd_high=0xffffffff\0" \
 	"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 9b1f93ca2a..d464f86968 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -60,7 +60,7 @@
 
 #define CONFIG_MFG_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS_DEFAULT \
-	"initrd_addr=0x83800000\0" \
+	"initrd_addr=0x86800000\0" \
 	"initrd_high=0xffffffff\0" \
 	"sd_dev=0\0" \
 	"mtdparts=" MFG_NAND_PARTITION \
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index c08e01a99e..2806f47128 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -71,7 +71,7 @@
 
 #define CONFIG_MFG_ENV_SETTINGS \
     CONFIG_MFG_ENV_SETTINGS_DEFAULT \
-	"initrd_addr=0x83800000\0" \
+	"initrd_addr=0x86800000\0" \
 	"initrd_high=0xffffffff\0" \
     "emmc_dev=2\0"\
     "sd_dev=1\0" \
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index b9ec799752..449081fed1 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -87,7 +87,7 @@
 
 #define CONFIG_MFG_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS_DEFAULT \
-	"initrd_addr=0x83800000\0" \
+	"initrd_addr=0x86800000\0" \
 	"initrd_high=0xffffffff\0" \
 	"emmc_dev=1\0"\
 	"sd_dev=1\0" \
diff --git a/include/configs/mx6ul_arm2.h b/include/configs/mx6ul_arm2.h
index 39273b6c59..150aaf9cb8 100644
--- a/include/configs/mx6ul_arm2.h
+++ b/include/configs/mx6ul_arm2.h
@@ -54,7 +54,7 @@
 		MFG_NAND_PARTITION \
 		"clk_ignore_unused "\
 		"\0" \
-	"initrd_addr=0x83800000\0" \
+	"initrd_addr=0x86800000\0" \
 	"initrd_high=0xffffffff\0" \
 	"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index 123acc460a..7c0a390cd1 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -87,7 +87,7 @@
 
 #define CONFIG_MFG_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS_DEFAULT \
-	"initrd_addr=0x83800000\0" \
+	"initrd_addr=0x86800000\0" \
 	"initrd_high=0xffffffff\0" \
 	"emmc_dev=1\0"\
 	"sd_dev=1\0" \
diff --git a/include/configs/mx7d_arm2.h b/include/configs/mx7d_arm2.h
index ce598cc69e..08cf32d753 100644
--- a/include/configs/mx7d_arm2.h
+++ b/include/configs/mx7d_arm2.h
@@ -100,7 +100,7 @@
 		"mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) " \
 		"clk_ignore_unused "\
 		"\0" \
-	"initrd_addr=0x83800000\0" \
+	"initrd_addr=0x86800000\0" \
 	"initrd_high=0xffffffff\0" \
 	"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index dc45ceaff1..f5171bb579 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -96,7 +96,7 @@
 
 #define CONFIG_MFG_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS_DEFAULT \
-	"initrd_addr=0x83800000\0" \
+	"initrd_addr=0x86800000\0" \
 	"initrd_high=0xffffffff\0" \
 	"emmc_dev=1\0"\
 	"sd_dev=0\0" \
diff --git a/include/configs/mx7ulp_arm2.h b/include/configs/mx7ulp_arm2.h
index ad3a0d20e8..41310262bd 100644
--- a/include/configs/mx7ulp_arm2.h
+++ b/include/configs/mx7ulp_arm2.h
@@ -118,7 +118,7 @@
 		"g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
 		"g_mass_storage.iSerialNumber=\"\" "\
 		"\0" \
-		"initrd_addr=0x63800000\0" \
+		"initrd_addr=0x66800000\0" \
 		"initrd_high=0xffffffff\0" \
 		"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 
diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index aa6197c516..7d49672af6 100644
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -94,7 +94,7 @@
 
 #define CONFIG_MFG_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS_DEFAULT  \
-	"initrd_addr=0x63800000\0" \
+	"initrd_addr=0x66800000\0" \
 	"initrd_high=0xffffffff\0" \
 	"emmc_dev=0\0" \
 	"sd_dev=0\0"