Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 58b2e4326195be2e5fa13feb6b986214e4bbcf0e

Authored by Zhang Bo
1 parent 7f1d172785
Exists in smarc_8mm-imx_v2019.04_4.19.35_1.1.0 and in 1 other branch smarc_8m-imx_v2019.04_4.19.35_1.1.0

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 <bo.zhang@nxp.com>

Showing 3 changed files with 10 additions and 2 deletions Side-by-side Diff

arch/arm/mach-imx/imx8/Kconfig
Diff comments   View file @ 58b2e43
... ... @@ -28,6 +28,13 @@
28 28 help
29 29 This memory will be reserved by system and linux cannot access.
30 30  
  31 +config IMX_LOAD_HDMI_FIMRWARE
  32 + bool "Enable HDMI firmware loading"
  33 + depends on ARCH_IMX8 || VIDEO_IMX_HDP_LOAD
  34 + help
  35 + This enable the hdmi firmware loading. It depends on the "hdp" and
  36 + "hdprx" commands.
  37 +
31 38 config IMX8
32 39 bool
33 40  
board/freescale/imx8qm_mek/imx8qm_mek.c
Diff comments   View file @ 58b2e43
... ... @@ -441,7 +441,7 @@
441 441 board_late_mmc_env_init();
442 442 #endif
443 443  
444   -#ifdef IMX_LOAD_HDMI_FIMRWARE
  444 +#ifdef CONFIG_IMX_LOAD_HDMI_FIMRWARE
445 445 char *end_of_uboot;
446 446 char command[256];
447 447 end_of_uboot = (char *)(ulong)(CONFIG_SYS_TEXT_BASE + _end_ofs + fdt_totalsize(gd->fdt_blob));
include/configs/imx8qm_mek_android.h
Diff comments   View file @ 58b2e43
... ... @@ -32,10 +32,11 @@
32 32 #define KEYSLOT_HWPARTITION_ID 2
33 33 #define KEYSLOT_BLKS 0x3FFF
34 34  
35   -#define IMX_LOAD_HDMI_FIMRWARE
  35 +#ifdef CONFIG_IMX_LOAD_HDMI_FIMRWARE
36 36 #define IMX_HDMI_FIRMWARE_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_64M)
37 37 #define IMX_HDMITX_FIRMWARE_SIZE 0x20000
38 38 #define IMX_HDMIRX_FIRMWARE_SIZE 0x20000
  39 +#endif
39 40  
40 41 #ifdef CONFIG_SYS_MALLOC_LEN
41 42 #undef CONFIG_SYS_MALLOC_LEN