summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2019-05-31 10:32:32 +0300
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2019-05-31 19:04:15 +0300
commit18b9a79feab0569cc40d624e1332778dab8a2013 (patch)
treef2aa99e7f64850705653b7ddfa5b7c77da36d5dc
parent3a2df323643ef2390fbb0538272f9b0d6f9c3694 (diff)
apalis-imx8: enable hdp firmware loadingfor-next
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--configs/apalis-imx8qm_defconfig1
-rw-r--r--include/configs/apalis-imx8.h13
2 files changed, 12 insertions, 2 deletions
diff --git a/configs/apalis-imx8qm_defconfig b/configs/apalis-imx8qm_defconfig
index d7dfc4a27b..f1c5511fd0 100644
--- a/configs/apalis-imx8qm_defconfig
+++ b/configs/apalis-imx8qm_defconfig
@@ -55,4 +55,5 @@ CONFIG_DM_SERIAL=y
CONFIG_FSL_LPUART=y
CONFIG_DM_THERMAL=y
CONFIG_IMX_SCU_THERMAL=y
+CONFIG_VIDEO_IMX_HDP_LOAD=y
# CONFIG_EFI_LOADER is not set
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index be2c5a2293..e5f0d1396a 100644
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -61,9 +61,12 @@
"fdt_file=fsl-imx8qm-apalis-eval.dtb\0" \
"fdtfile=fsl-imx8qm-apalis-eval.dtb\0" \
"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
+ "hdp_addr=0x84000000\0" \
+ "hdp_file=hdmitxfw.bin\0" \
"image=Image\0" \
"initrd_addr=0x83800000\0" \
"initrd_high=0xffffffffffffffff\0" \
+ "loadhdp=fatload mmc ${mmcdev}:${mmcpart} ${hdp_addr} ${hdp_file}\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=PARTUUID=${uuid} rootwait " \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
@@ -71,8 +74,10 @@
"netargs=setenv bootargs console=${console},${baudrate} " \
"root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \
"\0" \
- "nfsboot=run netargs; dhcp ${loadaddr} ${image}; tftp ${fdt_addr} " \
- "apalis-imx8/${fdt_file}; booti ${loadaddr} - ${fdt_addr}\0" \
+ "nfsboot=run netargs; dhcp ${loadaddr} ${image}; if tftp ${hdp_addr} " \
+ "${hdp_file}; then; hdp load ${hdp_addr}; fi; tftp " \
+ "${fdt_addr} apalis-imx8/${fdt_file}; booti ${loadaddr} - " \
+ "${fdt_addr}\0" \
"panel=NULL\0" \
"script=boot.scr\0" \
"update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \
@@ -81,6 +86,10 @@
"${blkcnt} / 0x200; mmc dev 0 1; mmc write ${loadaddr} 0x0 " \
"${blkcnt}; fi\0"
+#undef CONFIG_BOOTCOMMAND
+#define CONFIG_BOOTCOMMAND \
+ "if run loadhdp; then; hdp load ${hdp_addr}; fi; run distro_bootcmd"
+
/* Link Definitions */
#define CONFIG_LOADADDR 0x80280000