MLK-17922 imx8qm: hdp load only when the firmware is ready

There is no need to run hdp load when there is no hdmi firmware in
ddr.

Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/include/configs/imx8qm_arm2.h b/include/configs/imx8qm_arm2.h
index ee17c17..65dce63 100644 (file)
--- a/include/configs/imx8qm_arm2.h
+++ b/include/configs/imx8qm_arm2.h
@@ -186,7 +186,7 @@
        "hdp_file=dpfw.bin\0" \
        "loadhdp=fatload mmc ${mmcdev}:${mmcpart} ${hdp_addr} ${hdp_file}\0" \
        "mmcboot=echo Booting from mmc ...; " \
-               "run loadhdp; hdp load ${hdp_addr}; " \
+               "if run loadhdp; then; hdp load ${hdp_addr}; fi;" \
                "run mmcargs; " \
                "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
                        "if run loadfdt; then " \
@@ -208,7 +208,7 @@
                "else " \
                        "setenv get_cmd tftp; " \
                "fi; " \
-               "${get_cmd} ${hdp_addr} ${hdp_file}; hdp load ${hdp_addr}; " \
+               "if ${get_cmd} ${hdp_addr} ${hdp_file}; then; hdp load ${hdp_addr}; fi;" \
                "${get_cmd} ${loadaddr} ${image}; " \
                "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
                        "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \

diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 28bb58c..f44611a 100644 (file)
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -99,6 +99,7 @@
                 "${get_cmd} ${loadaddr} xen;" \
                 "${get_cmd} ${fdt_addr} fsl-imx8qm-mek-dom0.dtb;" \
                 "${get_cmd} ${initrd_addr} ${image};" \
+               "if ${get_cmd} ${hdp_addr} ${hdp_file}; then; hdp load ${hdp_addr}; fi" \
                 "fdt addr ${fdt_addr};" \
                 "fdt resize 256;" \
                 "fdt set /chosen/module@0 reg <0x00000000 ${initrd_addr} 0x00000000 0x${filesize}>; " \
@@ -176,7 +177,7 @@
        "hdp_file=hdmitxfw.bin\0" \
        "loadhdp=fatload mmc ${mmcdev}:${mmcpart} ${hdp_addr} ${hdp_file}\0" \
        "mmcboot=echo Booting from mmc ...; " \
-               "run loadhdp; hdp load ${hdp_addr}; " \
+               "if run loadhdp; then; hdp load ${hdp_addr}; fi;" \
                "run mmcargs; " \
                "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
                        "if run loadfdt; then " \
@@ -198,7 +199,7 @@
                "else " \
                        "setenv get_cmd tftp; " \
                "fi; " \
-               "${get_cmd} ${hdp_addr} ${hdp_file}; hdp load ${hdp_addr}; " \
+               "if ${get_cmd} ${hdp_addr} ${hdp_file}; then; hdp load ${hdp_addr}; fi" \
                "${get_cmd} ${loadaddr} ${image}; " \
                "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
                        "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \