From 9e0ec51fc5a95cb197c9579414343ab3e1d0419a Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Thu, 11 Oct 2018 14:38:46 +0800 Subject: [PATCH] MLK-19882 imx8qm/qxp: introduce dom0fdt_file env Introduce dom0fdt_file env to let user could change the dom0 dtb file. Signed-off-by: Peng Fan Reviewed-by: Ye Li (cherry picked from commit 3d99b1667943658dafd4c3f5d98bab027aab9346) --- include/configs/imx8qm_arm2.h | 3 ++- include/configs/imx8qm_mek.h | 3 ++- include/configs/imx8qxp_mek.h | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/configs/imx8qm_arm2.h b/include/configs/imx8qm_arm2.h index 17fe5e576d..e473eaff6c 100644 --- a/include/configs/imx8qm_arm2.h +++ b/include/configs/imx8qm_arm2.h @@ -137,9 +137,10 @@ "xenlinux_bootargs= \0" \ "xenlinux_console=hvc0 earlycon=xen\0" \ "xenlinux_addr=0x85000000\0" \ + "dom0fdt_file=fsl-imx8qm-lpddr4-arm2-dom0.dtb\0" \ "xenboot_common=" \ "${get_cmd} ${loadaddr} xen;" \ - "${get_cmd} ${fdt_addr} fsl-imx8qm-lpddr4-arm2-dom0.dtb;" \ + "${get_cmd} ${fdt_addr} ${dom0fdt_file};" \ "${get_cmd} ${xenlinux_addr} ${image};" \ "fdt addr ${fdt_addr};" \ "fdt resize 256;" \ diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 2cc942776e..2bf5003521 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -122,9 +122,10 @@ "xenlinux_bootargs= \0" \ "xenlinux_console=hvc0 earlycon=xen\0" \ "xenlinux_addr=0x85000000\0" \ + "dom0fdt_file=fsl-imx8qm-mek-dom0.dtb\0" \ "xenboot_common=" \ "${get_cmd} ${loadaddr} xen;" \ - "${get_cmd} ${fdt_addr} fsl-imx8qm-mek-dom0.dtb;" \ + "${get_cmd} ${fdt_addr} ${dom0fdt_file};" \ "if ${get_cmd} ${hdp_addr} ${hdp_file}; then; hdp load ${hdp_addr}; fi;" \ "if ${get_cmd} ${hdprx_addr} ${hdprx_file}; then; hdprx load ${hdprx_addr}; fi;" \ "${get_cmd} ${xenlinux_addr} ${image};" \ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index abdb741519..1df81aca52 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -100,9 +100,10 @@ "xenlinux_bootargs= \0" \ "xenlinux_console=hvc0 earlycon=xen\0" \ "xenlinux_addr=0x85000000\0" \ + "dom0fdt_file=fsl-imx8qxp-mek-dom0.dtb\0" \ "xenboot_common=" \ "${get_cmd} ${loadaddr} xen;" \ - "${get_cmd} ${fdt_addr} fsl-imx8qxp-mek-dom0.dtb;" \ + "${get_cmd} ${fdt_addr} ${dom0fdt_file};" \ "${get_cmd} ${xenlinux_addr} ${image};" \ "fdt addr ${fdt_addr};" \ "fdt resize 256;" \ -- 2.17.1