MLK-20775: imx8qm/qxp: change xenlinux_addr to avoid memory conflict

When booting M4 with alt_config enabled, M4 will reserve 128MB for
video framebuffer from 0x88000000 to its partition, but Dom0 linux
loading address is 0x85000000, which will cause confict, so change
xenlinux_addr from 0x85000000 to 0x92000000.

Signed-off-by: Flynn xu <flynn.xu@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit a6792ed6e578f4a5585dfc4370e3dbf348a4c8fd)

diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 8a3a7d2..f24a847 100644 (file)
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -127,7 +127,7 @@
             "xenhyper_bootargs=console=dtuart dtuart=/serial@5a060000 dom0_mem=2048M dom0_max_vcpus=2 dom0_vcpus_pin=true hmp-unsafe=true\0" \
             "xenlinux_bootargs= \0" \
             "xenlinux_console=hvc0 earlycon=xen\0" \
-            "xenlinux_addr=0x85000000\0" \
+            "xenlinux_addr=0x92000000\0" \
            "dom0fdt_file=fsl-imx8qm-mek-dom0.dtb\0" \
             "xenboot_common=" \
                 "${get_cmd} ${loadaddr} xen;" \

diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 8366ffe..2551fcd 100644 (file)
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2018 NXP
+ * Copyright 2018-2019 NXP
  */
 
 #ifndef __IMX8QXP_MEK_H
@@ -106,7 +106,7 @@
             "xenhyper_bootargs=console=dtuart dtuart=/serial@5a060000 dom0_mem=1024M dom0_max_vcpus=2 dom0_vcpus_pin=true\0" \
             "xenlinux_bootargs= \0" \
             "xenlinux_console=hvc0 earlycon=xen\0" \
-            "xenlinux_addr=0x85000000\0" \
+            "xenlinux_addr=0x92000000\0" \
            "dom0fdt_file=fsl-imx8qxp-mek-dom0.dtb\0" \
             "xenboot_common=" \
                 "${get_cmd} ${loadaddr} xen;" \