summaryrefslogtreecommitdiff
path: root/include/configs/mx6ul_14x14_evk.h
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2019-01-22 01:03:41 -0800
committerYe Li <ye.li@nxp.com>2019-01-22 01:03:41 -0800
commit2a092ea07ec1b0836793fd75cefbacc35b90d2cf (patch)
tree328a3f42ca7c6ab6e1d617a1b6dcc3718a6365b7 /include/configs/mx6ul_14x14_evk.h
parent9dada8a697b1c103fdb28f528f168da7ecc20849 (diff)
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>
Diffstat (limited to 'include/configs/mx6ul_14x14_evk.h')
-rw-r--r--include/configs/mx6ul_14x14_evk.h2
1 files changed, 1 insertions, 1 deletions
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" \