Convert CONFIG_CMD_HDMIDETECT to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_HDMIDETECT

Note that we cannot do 'default y if VIDEO' because this option is only
enabled for a small subset of mx6 boards. Also this command is is not a
great implementation (it doesn't use driver model).

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index dd567df8541b94c20d99db2460e3290c932fdd3f..7abe2bc74bb01b7a8e5beff35021d74514d1441e 100644 (file)
--- a/README
+++ b/README
@@ -2717,11 +2717,6 @@ The following options need to be configured:
                Note: There is also a sha1sum command, which should perhaps
                be deprecated in favour of 'hash sha1'.
 
-- Freescale i.MX specific commands:
-               CONFIG_CMD_HDMIDETECT
-               This enables 'hdmidet' command which returns true if an
-               HDMI monitor is detected.  This command is i.MX 6 specific.
-
 - bootcount support:
                CONFIG_BOOTCOUNT_LIMIT
 

diff --git a/arch/arm/imx-common/Kconfig b/arch/arm/imx-common/Kconfig
index 25cbd12c899e8b732349fdc57affad3a86886c03..cd8b8d2882983beebc0f9e6e7d271b8326333ee5 100644 (file)
--- a/arch/arm/imx-common/Kconfig
+++ b/arch/arm/imx-common/Kconfig
@@ -55,3 +55,9 @@ config CMD_DEKBLOB
          Freescale secure boot mechanism. This command encapsulates and
          creates a blob of data. See also CMD_BLOB and doc/README.mxc_hab for
          more information.
+
+config CMD_HDMIDETECT
+       bool "Support the 'hdmidet' command"
+       help
+         This enables the 'hdmidet' command which detects if an HDMI monitor
+         is connected.

diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index 90829b49492749ac28599f738ef68f9ac2c245dc..f586773761ef4e2d0cf9c0c0ce8df3586a71488d 100644 (file)
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -7,6 +7,7 @@ CONFIG_TARGET_APALIS_IMX6=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_VIDEO=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set

diff --git a/configs/apalis_imx6_nospl_com_defconfig b/configs/apalis_imx6_nospl_com_defconfig
index ef9ca60b426017d2ff9c239a019222024e4d5dd7..42abbbd49d535592445841a666bc56bbd43a65b4 100644 (file)
--- a/configs/apalis_imx6_nospl_com_defconfig
+++ b/configs/apalis_imx6_nospl_com_defconfig
@@ -3,6 +3,7 @@ CONFIG_SYS_THUMB_BUILD=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_APALIS_IMX6=y
 CONFIG_VIDEO=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis_imx6/apalis_imx6q.cfg,MX6Q,DDR_MB=1024"
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set

diff --git a/configs/apalis_imx6_nospl_it_defconfig b/configs/apalis_imx6_nospl_it_defconfig
index f48bd17c42e7e57e0259088e76c993a0497867ce..18f0d02e550b23642e9583bbe4768caadff735c1 100644 (file)
--- a/configs/apalis_imx6_nospl_it_defconfig
+++ b/configs/apalis_imx6_nospl_it_defconfig
@@ -3,6 +3,7 @@ CONFIG_SYS_THUMB_BUILD=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_APALIS_IMX6=y
 CONFIG_VIDEO=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis_imx6/apalis_imx6q.cfg,MX6Q,DDR_MB=2048"
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set

diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index 47e8198e77456fbfbd08af7d3b2c09a09dd6fa49..6c105767fcb33a18dd89c4e1fd312c5e50984ecd 100644 (file)
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -7,6 +7,7 @@ CONFIG_TARGET_COLIBRI_IMX6=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_VIDEO=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set

diff --git a/configs/colibri_imx6_nospl_defconfig b/configs/colibri_imx6_nospl_defconfig
index 52e0d504115597cc083f5ffa533a0e2eac37e973..bd2ac24d4a4442b8bfa3949b069bc4ed73e01d58 100644 (file)
--- a/configs/colibri_imx6_nospl_defconfig
+++ b/configs/colibri_imx6_nospl_defconfig
@@ -3,6 +3,7 @@ CONFIG_SYS_THUMB_BUILD=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_COLIBRI_IMX6=y
 CONFIG_VIDEO=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx6/colibri_imx6.cfg,MX6DL,DDR_MB=256"
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set

diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index f665cca7b8a8d5f645e5d2812eacd3289f6cc26f..0d0d1421c8a6bc8ecca807efb20c409b597a56c0 100644 (file)
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -12,6 +12,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_VIDEO=y
 CONFIG_SPL_STACK_R_ADDR=0x18000000
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index c94bedf060949e1efb991d82fbdc4d9a3e046501..8f6618901df272b6e6430a2e86f13f6d7aa6d538 100644 (file)
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -12,6 +12,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_VIDEO=y
 CONFIG_SPL_STACK_R_ADDR=0x18000000
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index c362be92e15436b3e84408676b148e7c32511dab..5545171bb3ca1d1026957c4b8fd47cac24e6fa08 100644 (file)
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -13,6 +13,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_VIDEO=y
 CONFIG_SPL_STACK_R_ADDR=0x18000000
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
index c34beb74e2f97176042a8641ecc9e3d7b6de02da..b180f5407549a241cae20c172db04b4a09ce06dc 100644 (file)
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -9,6 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 # CONFIG_CMD_BMODE is not set
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_VIDEO=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"

diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index c4301e1f0af73ba95faff69d1ec8362b1fc8b54f..a54279978fb02072c5f81c29f0898b85f057ca24 100644 (file)
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_VIDEO=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y

diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 9b16bf48b03bec548862269030b95783ddad8d0c..5744ede776f44c98e6d826b8d58550e82c40fc0d 100644 (file)
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_VIDEO=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y

diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 83bbf8e02f1c8ccddfb6a48b9d45687f0a97a0b0..dca89ec34ec9e78bcdb06ca63c898bec4c9fe771 100644 (file)
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_VIDEO=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y

diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index 69cf637eea5408c304db637cdf88b532866f7084..a19d093710883b1a0f94f5d102ec5c07e547723d 100644 (file)
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_VIDEO=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y

diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index 2e9ee2e29316990c605b72d745181a5bba9e4b2a..edf4b6377a461d2851deb959dcf31bb659cf66bb 100644 (file)
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_VIDEO=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y

diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index f3dd324dce471c0f566d9a1a251df2e0806d09e4..0f7532062a10c9846057ed31f30ee321ad734fca 100644 (file)
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_VIDEO=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y

diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index 5a825d6e22d8e2dd9283e6ba662bc3ad16011a19..45a5acb96ca9103594787d08a6a163a59d141e0c 100644 (file)
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_VIDEO=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y

diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index 44d5b55556229033a8f206ff9772a89e0b01e7ba..49b963c64fa4b8016218909462ad6d9a5b41170d 100644 (file)
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SPL_FAT_SUPPORT=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_VIDEO=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y

diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig
index c8219b5543e8bb6ecf69faa0cc330e0b3feb62fa..c55537c03274a3ddba67d394f7ca9e48d7d4e150 100644 (file)
--- a/configs/pcm058_defconfig
+++ b/configs/pcm058_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=3

diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index e4622830ca65548671523fc35a3f72283b6feb4f..da042ae03f16e4dc7cecfc6903c03342bfcaccc8 100644 (file)
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TBS2910=y
 CONFIG_PRE_CONSOLE_BUFFER=y
 CONFIG_VIDEO=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
 CONFIG_PRE_CON_BUF_ADDR=0x7c000000

diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index f4c9b6bc76f90c6e9cf42705d68126da94e50482..b4b3283829883e3044553efec0687f0d1ea1f1b0 100644 (file)
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -9,6 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_VIDEO=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
 # CONFIG_CONSOLE_MUX is not set

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 8eddb68d3b4d892e4bffa21729b4572eac597f38..9220d04e7984db3a0c99b1d176c1212f4bfc0dbb 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -133,7 +133,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IPUV3_CLK               260000000
-#define CONFIG_CMD_HDMIDETECT
 #define CONFIG_CONSOLE_MUX
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 6189a6191f04fb2310f900f981d925adfbd64e7c..0882ef8f89755662627be98237de898ae3b3e727 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -114,7 +114,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IPUV3_CLK               260000000
-#define CONFIG_CMD_HDMIDETECT
 #define CONFIG_CONSOLE_MUX
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 68e69b8a59054c4592ce157ddad0ec058d7fb694..2227eead62b0d7d6b567edcfe855c1e56a618089 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -140,7 +140,6 @@
 #define CONFIG_POWER_LTC3676_I2C_ADDR  0x3c
 
 /* Various command support */
-#define CONFIG_CMD_HDMIDETECT    /* detect HDMI output device */
 #define CONFIG_CMD_UNZIP         /* gzwrite */
 #define CONFIG_RBTREE
 
@@ -173,7 +172,6 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_IPUV3_CLK          260000000
-#define CONFIG_CMD_HDMIDETECT
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 #define CONFIG_VIDEO_BMP_LOGO

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index b2cecc5d0eb46a93a7e8c64f270019ef21f255c3..bc22f56d1da14a828e0fc5d6ebad53282e3c6a0e 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -40,7 +40,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IMX_HDMI
-#define CONFIG_CMD_HDMIDETECT
 #define CONFIG_IMX_VIDEO_SKIP
 
 /* USB */

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 13625286c5b7274aa873209b297c0c14ca231275..00b84f757a404560d028e53812352cc74743ca37 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -93,7 +93,6 @@
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (6 * 1024 * 1024)
 #define CONFIG_BMP_16BPP
 #define CONFIG_IPUV3_CLK 260000000
-#define CONFIG_CMD_HDMIDETECT
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 753b59f6ecbdb1498ee6a030c266c5d3126f60f9..6cb1807a8e6c9bca321077c960f8b37d2a2a68f5 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -156,7 +156,6 @@
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_IPUV3_CLK               260000000
-#define CONFIG_CMD_HDMIDETECT
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 #endif

diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 44b4ffdf99d14a20431cfec21c6ffd186da4f742..39018ac62f247ef41ae07dd135db93ab25cb3a39 100644 (file)
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -86,7 +86,6 @@
 #define MTDPARTS_DEFAULT  "mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
 
 /* Various command support */
-#define CONFIG_CMD_HDMIDETECT    /* detect HDMI output device */
 #define CONFIG_RBTREE
 
 /* Physical Memory Map */

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 9720a09b32339aaef17a03306f1ce69a3abee84f..84ca1c443e41de948d29603efb0c393f21ffbda3 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -69,7 +69,6 @@
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
-#define CONFIG_CMD_HDMIDETECT
 #endif
 
 /* PCI */

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 3e0ea71e69af90b66fe5a0583a30dd111a990303..2a6c6fbb703b4cccc909ebc519a086a25ed95a6f 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -74,7 +74,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IPUV3_CLK 260000000
-#define CONFIG_CMD_HDMIDETECT
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 #endif

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 6aaafaf0cd16d9b768288f3c34dd31ddcae2452a..b751c3ef8e2787c44f58816e970c598074128be7 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -383,8 +383,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_HD44780
-CONFIG_CMD_HDMIDETECT
 CONFIG_CMD_IDE
 CONFIG_CMD_IMMAP
 CONFIG_CMD_IMXOTP