video: add CONFIG_I2C_EDID and disable CONFIG_DISPLAY by default

PATCH New Anatolij Gustschin 4 participants 5 messages Jan 25, 2016 – Jan 26, 2016 Framebuffer layer

Share & tools

Anatolij Gustschin

author

2016-01-25 16:17 UTC #0 lore raw

PATCH 1/1 video: add CONFIG_I2C_EDID and disable CONFIG_DISPLAY by default

Enabling CONFIG_DISPLAY breaks building for some architectures (microblaze-generic), so we disable CONFIG_DISPLAY in Kconfig by default and enable this option in defconfigs. CONFIG_DISPLAY depends on CONFIG_I2C_EDID, so add and enable it in defconfigs, too.

Signed-off-by Anatolij Gustschin <[email protected]>

Reported-by Bin Meng <[email protected]>

Cc Simon Glass <[email protected]>

---
 configs/chromebook_jerry_defconfig |  2 ++
 configs/firefly-rk3288_defconfig   |  2 ++
 configs/nyan-big_defconfig         |  1 +
 configs/rock2_defconfig            |  2 ++
 drivers/video/Kconfig              | 10 +++++++++-
 include/configs/chromebook_jerry.h |  1 -
 include/configs/firefly-rk3288.h   |  1 -
 include/configs/nyan-big.h         |  2 --
 include/configs/rock2.h            |  1 -
 9 files changed, 16 insertions(+), 6 deletions(-)

configs/chromebook_jerry_defconfig +2 -0

index 27e53c1..bd8b964 100644
@@ -55,6 +55,8 @@ CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_DM_VIDEO=y
+CONFIG_I2C_EDID=y
+CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROTATION=y
 CONFIG_VIDEO_ROCKCHIP=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/firefly-rk3288_defconfig +2 -0

index 15eb4d8..3b29158 100644
@@ -47,6 +47,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
 CONFIG_DM_VIDEO=y
+CONFIG_I2C_EDID=y
+CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROTATION=y
 CONFIG_VIDEO_ROCKCHIP=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/nyan-big_defconfig +1 -0

index 03348a6..ca0f9e0 100644
@@ -26,6 +26,7 @@ CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_DISPLAY=y
+CONFIG_I2C_EDID=y
 CONFIG_VIDEO_TEGRA124=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_TPM=y

configs/rock2_defconfig +2 -0

index 2563775..68e3b36 100644
@@ -45,6 +45,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
 CONFIG_DM_VIDEO=y
+CONFIG_I2C_EDID=y
+CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROTATION=y
 CONFIG_VIDEO_ROCKCHIP=y
 CONFIG_USE_PRIVATE_LIBGCC=y

drivers/video/Kconfig +9 -1

index 912e397..3fd781b 100644
@@ -293,10 +293,18 @@ config VIDEO_LCD_SPI_MISO
 	option takes a string in the format understood by 'name_to_gpio'
 	function, e.g. PH1 for pin 1 of port H.
 
+config I2C_EDID
+	bool "Enable EDID library"
+	depends on DM_I2C
+	default n
+	help
+	   This enables library for accessing EDID data from an LCD panel.
+
 config DISPLAY
 	bool "Enable Display support"
 	depends on DM
-	default y
+	default n
+	select I2C_EDID
 	help
 	   This supports drivers that provide a display, such as eDP (Embedded
 	   DisplayPort) and HDMI (High Definition Multimedia Interface).

include/configs/chromebook_jerry.h +0 -1

index 150e876..67f45c0 100644
@@ -30,7 +30,6 @@
 #define CONFIG_SPL_POWER_SUPPORT
 #define CONFIG_SPL_I2C_SUPPORT
 
-#define CONFIG_I2C_EDID
 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_CONSOLE_SCROLL_LINES		10

include/configs/firefly-rk3288.h +0 -1

index d6423e7..a29f557 100644
@@ -24,7 +24,6 @@
  */
 #define CONFIG_ENV_OFFSET (96 * 1024)
 
-#define CONFIG_I2C_EDID
 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_CONSOLE_SCROLL_LINES		10

include/configs/nyan-big.h +0 -2

index 9464153..176f6e9 100644
@@ -37,8 +37,6 @@
 #define CONFIG_SYS_MMC_ENV_PART		2
 #define CONFIG_ENV_OFFSET		(-CONFIG_ENV_SIZE)
 
-#define CONFIG_I2C_EDID
-
 /* LCD support */
 #define CONFIG_LCD
 #define CONFIG_PWM_TEGRA

include/configs/rock2.h +0 -1

index d6423e7..a29f557 100644
@@ -24,7 +24,6 @@
  */
 #define CONFIG_ENV_OFFSET (96 * 1024)
 
-#define CONFIG_I2C_EDID
 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_CONSOLE_SCROLL_LINES		10

Signature · 1 line

1.9.1

Tom Rini

2016-01-25 21:30 UTC #1 lore raw

PATCH 1/1 video: add CONFIG_I2C_EDID and disable CONFIG_DISPLAY by default

Quoted 8 lines · Anatolij Gustschin

Enabling CONFIG_DISPLAY breaks building for some architectures (microblaze-generic), so we disable CONFIG_DISPLAY in Kconfig by default and enable this option in defconfigs. CONFIG_DISPLAY depends on CONFIG_I2C_EDID, so add and enable it in defconfigs, too.
Signed-off-by Anatolij Gustschin <[email protected]>
Reported-by Bin Meng <[email protected]>
Cc Simon Glass <[email protected]>

Reviewed-by Tom Rini <[email protected]>

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160125/dfa297ca/attachment.sig>

Simon Glass

2016-01-25 21:43 UTC #2 lore raw

PATCH 1/1 video: add CONFIG_I2C_EDID and disable CONFIG_DISPLAY by default

In reply to Anatolij Gustschin

Quoted 8 lines · Anatolij Gustschin

Enabling CONFIG_DISPLAY breaks building for some architectures (microblaze-generic), so we disable CONFIG_DISPLAY in Kconfig by default and enable this option in defconfigs. CONFIG_DISPLAY depends on CONFIG_I2C_EDID, so add and enable it in defconfigs, too.
Signed-off-by Anatolij Gustschin <[email protected]>
Reported-by Bin Meng <[email protected]>
Cc Simon Glass <[email protected]>

Quoted 11 lines

---
 configs/chromebook_jerry_defconfig |  2 ++
 configs/firefly-rk3288_defconfig   |  2 ++
 configs/nyan-big_defconfig         |  1 +
 configs/rock2_defconfig            |  2 ++
 drivers/video/Kconfig              | 10 +++++++++-
 include/configs/chromebook_jerry.h |  1 -
 include/configs/firefly-rk3288.h   |  1 -
 include/configs/nyan-big.h         |  2 --
 include/configs/rock2.h            |  1 -
 9 files changed, 16 insertions(+), 6 deletions(-)

Reviewed-by Simon Glass <[email protected]>

Bin Meng

2016-01-26 04:07 UTC #3 lore raw

PATCH 1/1 video: add CONFIG_I2C_EDID and disable CONFIG_DISPLAY by default

In reply to Anatolij Gustschin

Quoted 8 lines · Anatolij Gustschin

Enabling CONFIG_DISPLAY breaks building for some architectures (microblaze-generic), so we disable CONFIG_DISPLAY in Kconfig by default and enable this option in defconfigs. CONFIG_DISPLAY depends on CONFIG_I2C_EDID, so add and enable it in defconfigs, too.
Signed-off-by Anatolij Gustschin <[email protected]>
Reported-by Bin Meng <[email protected]>
Cc Simon Glass <[email protected]>

Quoted 12 lines

---
 configs/chromebook_jerry_defconfig |  2 ++
 configs/firefly-rk3288_defconfig   |  2 ++
 configs/nyan-big_defconfig         |  1 +
 configs/rock2_defconfig            |  2 ++
 drivers/video/Kconfig              | 10 +++++++++-
 include/configs/chromebook_jerry.h |  1 -
 include/configs/firefly-rk3288.h   |  1 -
 include/configs/nyan-big.h         |  2 --
 include/configs/rock2.h            |  1 -
 9 files changed, 16 insertions(+), 6 deletions(-)

Tested with buildman on all curent 1100 boards

Tested-by Bin Meng <[email protected]>

Anatolij Gustschin

author

2016-01-26 07:12 UTC #4 lore raw

PATCH 1/1 video: add CONFIG_I2C_EDID and disable CONFIG_DISPLAY by default

In reply to Anatolij Gustschin

Quoted 8 lines

Enabling CONFIG_DISPLAY breaks building for some architectures (microblaze-generic), so we disable CONFIG_DISPLAY in Kconfig by default and enable this option in defconfigs. CONFIG_DISPLAY depends on CONFIG_I2C_EDID, so add and enable it in defconfigs, too.
Signed-off-by Anatolij Gustschin <[email protected]>
Reported-by Bin Meng <[email protected]>
Cc Simon Glass <[email protected]>

Quoted 11 lines

---
 configs/chromebook_jerry_defconfig |  2 ++
 configs/firefly-rk3288_defconfig   |  2 ++
 configs/nyan-big_defconfig         |  1 +
 configs/rock2_defconfig            |  2 ++
 drivers/video/Kconfig              | 10 +++++++++-
 include/configs/chromebook_jerry.h |  1 -
 include/configs/firefly-rk3288.h   |  1 -
 include/configs/nyan-big.h         |  2 --
 include/configs/rock2.h            |  1 -
 9 files changed, 16 insertions(+), 6 deletions(-)

applied to u-boot-video/master.

--
Anatolij