summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-01-26 09:48:07 -0500
committerTom Rini <trini@konsulko.com>2016-01-26 09:48:07 -0500
commitb72ae192e39f933100b0eb034768cb4daeebf67a (patch)
tree34d7b00636a472040f81b3ee1ae7f1a0a09ec1b7 /configs
parentd6ea6d88769e85f6873a94065a1ba167c9b592da (diff)
parent7588c312528eea9e24ef5c1b9a29a256ac5024d4 (diff)
downloadtalos-obmc-uboot-b72ae192e39f933100b0eb034768cb4daeebf67a.tar.gz
talos-obmc-uboot-b72ae192e39f933100b0eb034768cb4daeebf67a.zip
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'configs')
-rw-r--r--configs/chromebook_jerry_defconfig2
-rw-r--r--configs/firefly-rk3288_defconfig2
-rw-r--r--configs/nyan-big_defconfig1
-rw-r--r--configs/rock2_defconfig2
4 files changed, 7 insertions, 0 deletions
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index 27e53c14c6..bd8b9649ce 100644
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -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
diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
index 15eb4d87b9..3b29158f4a 100644
--- a/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_defconfig
@@ -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
diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index 03348a6987..ca0f9e067b 100644
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -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
diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
index 2563775c6b..68e3b367a3 100644
--- a/configs/rock2_defconfig
+++ b/configs/rock2_defconfig
@@ -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
OpenPOWER on IntegriCloud