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>

diff --git a/configs/imx8qm_ddr4_arm2_defconfig b/configs/imx8qm_ddr4_arm2_defconfig
index d15857b..7c458a2 100644 (file)
--- a/configs/imx8qm_ddr4_arm2_defconfig
+++ b/configs/imx8qm_ddr4_arm2_defconfig
@@ -62,6 +62,7 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 
 CONFIG_VIDEO=y
+CONFIG_VIDEO_IMX_HDP_LOAD=y
 
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX8=y

diff --git a/configs/imx8qm_lpddr4_arm2_defconfig b/configs/imx8qm_lpddr4_arm2_defconfig
index 29a0d85..79f9709 100644 (file)
--- a/configs/imx8qm_lpddr4_arm2_defconfig
+++ b/configs/imx8qm_lpddr4_arm2_defconfig
@@ -62,6 +62,7 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 
 CONFIG_VIDEO=y
+CONFIG_VIDEO_IMX_HDP_LOAD=y
 
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX8=y

diff --git a/configs/imx8qm_lpddr4_arm2_fspi_defconfig b/configs/imx8qm_lpddr4_arm2_fspi_defconfig
index 634232f..7878c97 100644 (file)
--- a/configs/imx8qm_lpddr4_arm2_fspi_defconfig
+++ b/configs/imx8qm_lpddr4_arm2_fspi_defconfig
@@ -63,6 +63,7 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 
 CONFIG_VIDEO=y
+CONFIG_VIDEO_IMX_HDP_LOAD=y
 
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX8=y

diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig
index ef2314c..9b1ee4c 100644 (file)
--- a/configs/imx8qm_mek_defconfig
+++ b/configs/imx8qm_mek_defconfig
@@ -62,6 +62,7 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 
 CONFIG_VIDEO=y
+CONFIG_VIDEO_IMX_HDP_LOAD=y
 
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX8=y

diff --git a/configs/imx8qm_mek_fspi_defconfig b/configs/imx8qm_mek_fspi_defconfig
index e9ca760..c9ffb6a 100644 (file)
--- a/configs/imx8qm_mek_fspi_defconfig
+++ b/configs/imx8qm_mek_fspi_defconfig
@@ -63,6 +63,7 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 
 CONFIG_VIDEO=y
+CONFIG_VIDEO_IMX_HDP_LOAD=y
 
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX8=y

diff --git a/include/configs/imx8qm_arm2.h b/include/configs/imx8qm_arm2.h
index d679c73..f62d26b 100644 (file)
--- a/include/configs/imx8qm_arm2.h
+++ b/include/configs/imx8qm_arm2.h
@@ -174,13 +174,16 @@
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot} " \
-       "video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0" \
        "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
        "bootscript=echo Running bootscript from mmc ...; " \
                "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 ...; " \
+               "run loadhdp; hdp load ${hdp_addr}; " \
                "run mmcargs; " \
                "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
                        "if run loadfdt; then " \
@@ -202,6 +205,7 @@
                "else " \
                        "setenv get_cmd tftp; " \
                "fi; " \
+               "${get_cmd} ${hdp_addr} ${hdp_file}; hdp load ${hdp_addr}; " \
                "${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 6758e63..a4037a8 100644 (file)
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -142,13 +142,16 @@
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot} " \
-       "video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0" \
        "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
        "bootscript=echo Running bootscript from mmc ...; " \
                "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 ...; " \
+               "run loadhdp; hdp load ${hdp_addr}; " \
                "run mmcargs; " \
                "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
                        "if run loadfdt; then " \
@@ -170,6 +173,7 @@
                "else " \
                        "setenv get_cmd tftp; " \
                "fi; " \
+               "${get_cmd} ${hdp_addr} ${hdp_file}; hdp load ${hdp_addr}; " \
                "${get_cmd} ${loadaddr} ${image}; " \
                "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
                        "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \