From 2046e0ef415a2840f56a0c967ca2d4492f2e1b40 Mon Sep 17 00:00:00 2001
From: Oliver Brown <oliver.brown@nxp.com>
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 <oliver.brown@nxp.com>
(cherry picked from commit 432e5b4347841095c3b5a8a0d106f35deadd006e)
(cherry picked from commit cb78a32fa8eb8c37932be003ebe4fa1f8c46c1d5)
(cherry picked from commit 5125e6c393e5dd068ebc9b9cfd724f6602f65c78)
---
 configs/imx8qm_mek_defconfig      | 2 ++
 configs/imx8qm_mek_fspi_defconfig | 2 ++
 include/configs/imx8qm_mek.h      | 8 ++++++++
 3 files changed, 12 insertions(+)

diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig
index aa608a45f7..a7e0366f13 100644
--- a/configs/imx8qm_mek_defconfig
+++ b/configs/imx8qm_mek_defconfig
@@ -170,3 +170,5 @@ CONFIG_DM_PCI=y
 CONFIG_USB_PORT_AUTO=y
 
 CONFIG_IMX_SNVS_SEC_SC=y
+
+CONFIG_VIDEO_IMX_HDP_LOAD=y
diff --git a/configs/imx8qm_mek_fspi_defconfig b/configs/imx8qm_mek_fspi_defconfig
index bf2c9ee296..087ca54e3b 100644
--- a/configs/imx8qm_mek_fspi_defconfig
+++ b/configs/imx8qm_mek_fspi_defconfig
@@ -169,3 +169,5 @@ CONFIG_DM_PCI=y
 CONFIG_USB_PORT_AUTO=y
 
 CONFIG_IMX_SNVS_SEC_SC=y
+
+CONFIG_VIDEO_IMX_HDP_LOAD=y
diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index dbf7c63f1b..76d02b41f2 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -173,10 +173,17 @@
 		"source\0" \
 	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+	"hdp_addr=0x9c000000\0" \
+	"hdprx_addr=0x9c800000\0" \
+	"hdp_file=hdmitxfw.bin\0" \
+	"hdprx_file=hdmirxfw.bin\0" \
+	"loadhdp=fatload mmc ${mmcdev}:${mmcpart} ${hdp_addr} ${hdp_file}\0" \
+	"loadhdprx=fatload mmc ${mmcdev}:${mmcpart} ${hdprx_addr} ${hdprx_file}\0" \
 	"boot_os=booti ${loadaddr} - ${fdt_addr};\0" \
 	"loadcntr=fatload mmc ${mmcdev}:${mmcpart} ${cntr_addr} ${cntr_file}\0" \
 	"auth_os=auth_cntr ${cntr_addr}\0" \
 	"mmcboot=echo Booting from mmc ...; " \
+		"if run loadhdp; then; hdp load ${hdp_addr}; fi;" \
 		"run mmcargs; " \
 		"if test ${sec_boot} = yes; then " \
 			"if run auth_os; then " \
@@ -205,6 +212,7 @@
 		"else " \
 			"setenv get_cmd tftp; " \
 		"fi; " \
+		"if ${get_cmd} ${hdp_addr} ${hdp_file}; then; hdp load ${hdp_addr}; fi;" \
 		"if test ${sec_boot} = yes; then " \
 			"${get_cmd} ${cntr_addr} ${cntr_file}; " \
 			"if run auth_os; then " \
-- 
2.17.1