From da057b1fefb27759cbb35a60d4210e2dc40061ee 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 (cherry picked from commit 432e5b4347841095c3b5a8a0d106f35deadd006e) (cherry picked from commit cb78a32fa8eb8c37932be003ebe4fa1f8c46c1d5) --- 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 | 5 +++++ include/configs/imx8qm_mek.h | 5 +++++ 7 files changed, 15 insertions(+) diff --git a/configs/imx8qm_ddr4_arm2_defconfig b/configs/imx8qm_ddr4_arm2_defconfig index 264bd9419f..8e7a745269 100644 --- 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 14debbf078..897a7658a1 100644 --- 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 0f9bd0ccac..a6393e04cd 100644 --- 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 4f7c7faca7..dcfa5063f1 100644 --- 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 15eaeb4a7a..97a5b547a2 100644 --- 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 f5d23a8771..7406ec39dd 100644 --- 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 710d700580..76574cbb84 100644 --- 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 " \ -- 2.17.1