Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ba43e01ee777b181a2c01682358de24f15173e89

Authored by Ye Li
1 parent 4333529337
Exists in smarc_8mm-imx_v2019.04_4.19.35_1.1.0 and in 1 other branch smarc_8m-imx_v2019.04_4.19.35_1.1.0

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)

Showing 5 changed files with 5 additions and 5 deletions Side-by-side Diff

include/configs/mx6sll_arm2.h
Diff comments   View file @ ba43e01
... ... @@ -51,7 +51,7 @@
51 51 "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
52 52 "g_mass_storage.iSerialNumber=\"\" "\
53 53 "\0" \
54   - "initrd_addr=0x83800000800000\0" \" \
  54 + "initrd_addr=0x86800000800000\0" \" \
55 55 "initrd_high=0xffffffff\0" \
56 56 "bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
57 57  
include/configs/mx6sx_arm2.h
Diff comments   View file @ ba43e01
... ... @@ -99,7 +99,7 @@
99 99 "g_mass_storage.iSerialNumber=\"\" "\
100 100 MFG_NAND_PARTITION \
101 101 "\0" \
102   - "initrd_addr=0x83800000800000\0" \" \
  102 + "initrd_addr=0x86800000800000\0" \" \
103 103 "initrd_high=0xffffffff\0" \
104 104 "bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
105 105  
include/configs/mx6ul_arm2.h
Diff comments   View file @ ba43e01
... ... @@ -54,7 +54,7 @@
54 54 MFG_NAND_PARTITION \
55 55 "clk_ignore_unused "\
56 56 "\0" \
57   - "initrd_addr=0x83800000800000\0" \" \
  57 + "initrd_addr=0x86800000800000\0" \" \
58 58 "initrd_high=0xffffffff\0" \
59 59 "bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
60 60  
include/configs/mx7d_arm2.h
Diff comments   View file @ ba43e01
... ... @@ -88,7 +88,7 @@
88 88 "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) " \
89 89 "clk_ignore_unused "\
90 90 "\0" \
91   - "initrd_addr=0x83800000800000\0" \" \
  91 + "initrd_addr=0x86800000800000\0" \" \
92 92 "initrd_high=0xffffffff\0" \
93 93 "bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
94 94  
include/configs/mx7ulp_arm2.h
Diff comments   View file @ ba43e01
... ... @@ -108,7 +108,7 @@
108 108 "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
109 109 "g_mass_storage.iSerialNumber=\"\" "\
110 110 "\0" \
111   - "initrd_addr=0x63800000800000\0" \" \
  111 + "initrd_addr=0x66800000800000\0" \" \
112 112 "initrd_high=0xffffffff\0" \
113 113 "bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
114 114