MLK-17205-3 video: imx: hdp: Adding configs for HDP firmware loading

Added default environment for hdp loading.
Added hdp loading as default for iMX8QM ARM2 and MEK boards.

Signed-off-by: Oliver Brown <oliver.brown@nxp.com>
(cherry picked from commit 432e5b4347841095c3b5a8a0d106f35deadd006e)
(cherry picked from commit cb78a32fa8eb8c37932be003ebe4fa1f8c46c1d5)

diff --git a/configs/imx8qm_ddr4_arm2_defconfig b/configs/imx8qm_ddr4_arm2_defconfig
index 264bd94..8e7a745 100644 (file)
--- a/configs/imx8qm_ddr4_arm2_defconfig
+++ b/configs/imx8qm_ddr4_arm2_defconfig
@@ -91,6 +91,7 @@ CONFIG_DM_THERMAL=y
 CONFIG_IMX_SC_THERMAL=y
 
 CONFIG_VIDEO=y
+CONFIG_VIDEO_IMX_HDP_LOAD=y
 
 CONFIG_SPI=y
 CONFIG_FSL_FSPI=y

diff --git a/configs/imx8qm_lpddr4_arm2_defconfig b/configs/imx8qm_lpddr4_arm2_defconfig
index 14debbf..897a765 100644 (file)
--- a/configs/imx8qm_lpddr4_arm2_defconfig
+++ b/configs/imx8qm_lpddr4_arm2_defconfig
@@ -91,6 +91,7 @@ CONFIG_DM_THERMAL=y
 CONFIG_IMX_SC_THERMAL=y
 
 CONFIG_VIDEO=y
+CONFIG_VIDEO_IMX_HDP_LOAD=y
 
 CONFIG_SPI=y
 CONFIG_FSL_FSPI=y

diff --git a/configs/imx8qm_lpddr4_arm2_fspi_defconfig b/configs/imx8qm_lpddr4_arm2_fspi_defconfig
index 0f9bd0c..a6393e0 100644 (file)
--- a/configs/imx8qm_lpddr4_arm2_fspi_defconfig
+++ b/configs/imx8qm_lpddr4_arm2_fspi_defconfig
@@ -91,6 +91,7 @@ CONFIG_DM_THERMAL=y
 CONFIG_IMX_SC_THERMAL=y
 
 CONFIG_VIDEO=y
+CONFIG_VIDEO_IMX_HDP_LOAD=y
 
 CONFIG_QSPI_BOOT=y
 CONFIG_SPI=y

diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig
index 4f7c7fa..dcfa506 100644 (file)
--- a/configs/imx8qm_mek_defconfig
+++ b/configs/imx8qm_mek_defconfig
@@ -90,6 +90,7 @@ CONFIG_DM_THERMAL=y
 CONFIG_IMX_SC_THERMAL=y
 
 CONFIG_VIDEO=y
+CONFIG_VIDEO_IMX_HDP_LOAD=y
 
 CONFIG_SPI=y
 CONFIG_FSL_FSPI=y

diff --git a/configs/imx8qm_mek_fspi_defconfig b/configs/imx8qm_mek_fspi_defconfig
index 15eaeb4..97a5b54 100644 (file)
--- a/configs/imx8qm_mek_fspi_defconfig
+++ b/configs/imx8qm_mek_fspi_defconfig
@@ -90,6 +90,7 @@ CONFIG_DM_THERMAL=y
 CONFIG_IMX_SC_THERMAL=y
 
 CONFIG_VIDEO=y
+CONFIG_VIDEO_IMX_HDP_LOAD=y
 
 CONFIG_QSPI_BOOT=y
 CONFIG_SPI=y

diff --git a/include/configs/imx8qm_arm2.h b/include/configs/imx8qm_arm2.h
index f5d23a8..7406ec3 100644 (file)
--- a/include/configs/imx8qm_arm2.h
+++ b/include/configs/imx8qm_arm2.h
@@ -150,7 +150,11 @@
                "source\0" \
        "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
        "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+       "hdp_addr=0x84000000\0" \
+       "hdp_file=dpfw.bin\0" \
+       "loadhdp=fatload mmc ${mmcdev}:${mmcpart} ${hdp_addr} ${hdp_file}\0" \
        "mmcboot=echo Booting from mmc ...; " \
+               "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 " \
@@ -171,6 +175,7 @@
                "else " \
                        "setenv get_cmd tftp; " \
                "fi; " \
+               "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 710d700..76574cb 100644 (file)
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -140,7 +140,11 @@
                "source\0" \
        "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
        "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+       "hdp_addr=0x84000000\0" \
+       "hdp_file=hdmitxfw.bin\0" \
+       "loadhdp=fatload mmc ${mmcdev}:${mmcpart} ${hdp_addr} ${hdp_file}\0" \
        "mmcboot=echo Booting from mmc ...; " \
+               "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 " \
@@ -161,6 +165,7 @@
                "else " \
                        "setenv get_cmd tftp; " \
                "fi; " \
+               "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 " \