LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Ye Li 2019-01-22 01:03:41 -08:00
parent 9dada8a697
commit 2a092ea07e
13 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/configs/mx6slevk.h
View File

@ -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" \

2
include/configs/mx6sll_arm2.h
View File

@ -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" \

2
include/configs/mx6sllevk.h
View File

@ -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" \

2
include/configs/mx6sx_arm2.h
View File

@ -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" \

2
include/configs/mx6sxsabreauto.h
View File

@ -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 \

2
include/configs/mx6sxsabresd.h
View File

@ -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" \

2
include/configs/mx6ul_14x14_evk.h
View File

@ -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" \

2
include/configs/mx6ul_arm2.h
View File

@ -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" \

2
include/configs/mx6ullevk.h
View File

@ -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" \

2
include/configs/mx7d_arm2.h
View File

@ -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" \

2
include/configs/mx7dsabresd.h
View File

@ -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" \

2
include/configs/mx7ulp_arm2.h
View File

@ -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" \

2
include/configs/mx7ulp_evk.h
View File

@ -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"