From 58b2e4326195be2e5fa13feb6b986214e4bbcf0e Mon Sep 17 00:00:00 2001 From: Zhang Bo Date: Thu, 24 Oct 2019 21:38:19 +0800 Subject: [PATCH] MA-15724: hdp: move macro IMX_LOAD_HDMI_FIMRWARE to Kconfig Move the macro IMX_LOAD_HDMI_FIMRWARE to Kconfig, so it can be enable or disable in different defconfig. Change-Id: I2e1291d3bc2d6efb29309525b33b84ba8f9b83da Signed-off-by: Zhang Bo --- arch/arm/mach-imx/imx8/Kconfig | 7 +++++++ board/freescale/imx8qm_mek/imx8qm_mek.c | 2 +- include/configs/imx8qm_mek_android.h | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig index 6b09a45..9d043b6 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -28,6 +28,13 @@ config BOOTAUX_RESERVED_MEM_SIZE help This memory will be reserved by system and linux cannot access. +config IMX_LOAD_HDMI_FIMRWARE + bool "Enable HDMI firmware loading" + depends on ARCH_IMX8 || VIDEO_IMX_HDP_LOAD + help + This enable the hdmi firmware loading. It depends on the "hdp" and + "hdprx" commands. + config IMX8 bool diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c index 06476f3..f344432 100644 --- a/board/freescale/imx8qm_mek/imx8qm_mek.c +++ b/board/freescale/imx8qm_mek/imx8qm_mek.c @@ -441,7 +441,7 @@ int board_late_init(void) board_late_mmc_env_init(); #endif -#ifdef IMX_LOAD_HDMI_FIMRWARE +#ifdef CONFIG_IMX_LOAD_HDMI_FIMRWARE char *end_of_uboot; char command[256]; end_of_uboot = (char *)(ulong)(CONFIG_SYS_TEXT_BASE + _end_ofs + fdt_totalsize(gd->fdt_blob)); diff --git a/include/configs/imx8qm_mek_android.h b/include/configs/imx8qm_mek_android.h index c1df633..cb5923e 100644 --- a/include/configs/imx8qm_mek_android.h +++ b/include/configs/imx8qm_mek_android.h @@ -32,10 +32,11 @@ #define KEYSLOT_HWPARTITION_ID 2 #define KEYSLOT_BLKS 0x3FFF -#define IMX_LOAD_HDMI_FIMRWARE +#ifdef CONFIG_IMX_LOAD_HDMI_FIMRWARE #define IMX_HDMI_FIRMWARE_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_64M) #define IMX_HDMITX_FIRMWARE_SIZE 0x20000 #define IMX_HDMIRX_FIRMWARE_SIZE 0x20000 +#endif #ifdef CONFIG_SYS_MALLOC_LEN #undef CONFIG_SYS_MALLOC_LEN -- 1.9.1