UBUNTU: [Config] Enabling DRM_OMAP as built-in

The new DRM driver for OMAP is an improved version over the previous
hdmi driver enabled by the kernel. The new driver supports proper edid
parsing with the hdmi and dvi output, without any new cmd line argument
when changing between outputs.

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

1 files changed, 14 insertions, 14 deletions

diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu
index 18ecccd750c..a1706b2cd2c 100644
--- a/debian.ti-omap4/config/config.common.ubuntu
+++ b/debian.ti-omap4/config/config.common.ubuntu
@@ -673,8 +673,12 @@ CONFIG_DNOTIFY=y
 CONFIG_DNS_RESOLVER=y
 CONFIG_DONGLE=y
 CONFIG_DRAGONRISE_FF=y
-CONFIG_DRM=m
-# CONFIG_DRM_OMAP is not set
+CONFIG_DRM=y
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
+CONFIG_DRM_KMS_HELPER=y
+CONFIG_DRM_OMAP=y
+CONFIG_DRM_OMAP_NUM_CRTCS=1
 CONFIG_DS1682=m
 CONFIG_DUMMY=m
 CONFIG_DUMMY_CONSOLE=y
@@ -833,9 +837,9 @@ CONFIG_FB=y
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
 # CONFIG_FB_BROADSHEET is not set
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_CFB_COPYAREA=m
+CONFIG_FB_CFB_FILLRECT=m
+CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 # CONFIG_FB_DDC is not set
 CONFIG_FB_DEFERRED_IO=y
@@ -843,18 +847,14 @@ CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_METRONOME is not set
 CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_OMAP2=y
-CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
-CONFIG_FB_OMAP2_NUM_FBS=2
-# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_SM501 is not set
 CONFIG_FB_SM7XX=m
 # CONFIG_FB_SVGALIB is not set
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_SYS_IMAGEBLIT=m
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FB_TMIO is not set
 CONFIG_FB_UDL=m
@@ -1067,7 +1067,7 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HZ=128
 CONFIG_I2C=y
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_COMPAT=y