summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2016-01-25 17:17:22 +0100
committerAnatolij Gustschin <agust@denx.de>2016-01-26 08:06:13 +0100
commit7588c312528eea9e24ef5c1b9a29a256ac5024d4 (patch)
treef1b2c0ef0119837730556447e1608d6477add1a2 /include
parente32951b525c5cd67aece0dffb7d4012b1567dcaf (diff)
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 <agust@denx.de> Reported-by: Bin Meng <bmeng.cn@gmail.com> Cc: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Bin Meng <bmeng.cn@gmail.com> Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'include')
-rw-r--r--include/configs/chromebook_jerry.h1
-rw-r--r--include/configs/firefly-rk3288.h1
-rw-r--r--include/configs/nyan-big.h2
-rw-r--r--include/configs/rock2.h1
4 files changed, 0 insertions, 5 deletions
diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h
index 150e8765d6..67f45c0f90 100644
--- a/include/configs/chromebook_jerry.h
+++ b/include/configs/chromebook_jerry.h
@@ -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
diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h
index d6423e7e55..a29f55709d 100644
--- a/include/configs/firefly-rk3288.h
+++ b/include/configs/firefly-rk3288.h
@@ -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
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index 9464153f58..176f6e902b 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -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
diff --git a/include/configs/rock2.h b/include/configs/rock2.h
index d6423e7e55..a29f55709d 100644
--- a/include/configs/rock2.h
+++ b/include/configs/rock2.h
@@ -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