Commit d583ccd3bd3e14c1ef31e7fec7c83f6e4e6f08b3
1 parent
63dbfc00b9
Exists in
smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga
and in
4 other branches
MLK-20976-1 imx8qm: mek: remove partition creation for domu
Partition creation will be done in xen, remove it from uboot. And add domu-android-auto property Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Flynn xu <flynn.xu@nxp.com> (cherry picked from commit 23f7a037d14d05c2eea5622bd8ffda2f23d04372)
Showing 1 changed file with 5 additions and 1 deletions Side-by-side Diff
include/configs/imx8qm_mek.h
| ... | ... | @@ -164,6 +164,7 @@ |
| 164 | 164 | "run netboot; \0" |
| 165 | 165 | |
| 166 | 166 | #define XEN_BOOT_ENV \ |
| 167 | + "domu-android-auto=no\0" \ | |
| 167 | 168 | "xenhyper_bootargs=console=dtuart dtuart=/serial@5a060000 dom0_mem=2048M dom0_max_vcpus=2 dom0_vcpus_pin=true hmp-unsafe=true\0" \ |
| 168 | 169 | "xenlinux_bootargs= \0" \ |
| 169 | 170 | "xenlinux_console=hvc0 earlycon=xen\0" \ |
| ... | ... | @@ -172,7 +173,6 @@ |
| 172 | 173 | "xenboot_common=" \ |
| 173 | 174 | "${get_cmd} ${loadaddr} xen;" \ |
| 174 | 175 | "${get_cmd} ${fdt_addr} ${dom0fdt_file};" \ |
| 175 | - "scu_rm dtb ${fdt_addr};" \ | |
| 176 | 176 | "if ${get_cmd} ${hdp_addr} ${hdp_file}; then; hdp load ${hdp_addr}; fi;" \ |
| 177 | 177 | "if ${get_cmd} ${hdprx_addr} ${hdprx_file}; then; hdprx load ${hdprx_addr}; fi;" \ |
| 178 | 178 | "${get_cmd} ${xenlinux_addr} ${image};" \ |
| ... | ... | @@ -180,6 +180,10 @@ |
| 180 | 180 | "fdt resize 256;" \ |
| 181 | 181 | "fdt set /chosen/module@0 reg <0x00000000 ${xenlinux_addr} 0x00000000 0x${filesize}>; " \ |
| 182 | 182 | "fdt set /chosen/module@0 bootargs \"${bootargs} ${xenlinux_bootargs}\"; " \ |
| 183 | + "if test ${domu-android-auto} = yes; then; " \ | |
| 184 | + "fdt set /domu/doma android-auto <1>;" \ | |
| 185 | + "fdt rm /gpio@5d090000 power-domains;" \ | |
| 186 | + "fi;" \ | |
| 183 | 187 | "setenv bootargs ${xenhyper_bootargs};" \ |
| 184 | 188 | "booti ${loadaddr} - ${fdt_addr};" \ |
| 185 | 189 | "\0" \ |