From 432e5b4347841095c3b5a8a0d106f35deadd006e Mon Sep 17 00:00:00 2001 From: Oliver Brown Date: Wed, 13 Dec 2017 17:14:58 -0600 Subject: [PATCH] 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 --- configs/imx8qm_ddr4_arm2_defconfig | 1 + configs/imx8qm_lpddr4_arm2_defconfig | 1 + configs/imx8qm_lpddr4_arm2_fspi_defconfig | 1 + configs/imx8qm_mek_defconfig | 1 + configs/imx8qm_mek_fspi_defconfig | 1 + include/configs/imx8qm_arm2.h | 6 +++++- include/configs/imx8qm_mek.h | 6 +++++- 7 files changed, 15 insertions(+), 2 deletions(-) diff --git a/configs/imx8qm_ddr4_arm2_defconfig b/configs/imx8qm_ddr4_arm2_defconfig index d15857bae4..7c458a2b9f 100644 --- 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 29a0d85e3d..79f97096b6 100644 --- 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 634232f115..7878c97996 100644 --- 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 ef2314cb80..9b1ee4c4d0 100644 --- 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 e9ca7602b0..c9ffb6a3dd 100644 --- 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 d679c73677..f62d26b781 100644 --- 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 6758e63f2b..a4037a8dce 100644 --- 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 " \ -- 2.17.1