MLK-20760-1 mx6/7 arm2: 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>
(cherry picked from commit 2a092ea07ec1b0836793fd75cefbacc35b90d2cf)
diff --git a/include/configs/mx6sll_arm2.h b/include/configs/mx6sll_arm2.h
index 4cb3531..d03d0a8 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/mx6sx_arm2.h b/include/configs/mx6sx_arm2.h
index 817a701..796570b 100644
--- a/include/configs/mx6sx_arm2.h
+++ b/include/configs/mx6sx_arm2.h
@@ -99,7 +99,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/mx6ul_arm2.h b/include/configs/mx6ul_arm2.h
index 3adf948..5263c0a 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/mx7d_arm2.h b/include/configs/mx7d_arm2.h
index fc84362..8db3913 100644
--- a/include/configs/mx7d_arm2.h
+++ b/include/configs/mx7d_arm2.h
@@ -88,7 +88,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/mx7ulp_arm2.h b/include/configs/mx7ulp_arm2.h
index 62afc93..1e22a54 100644
--- a/include/configs/mx7ulp_arm2.h
+++ b/include/configs/mx7ulp_arm2.h
@@ -108,7 +108,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" \
