UBUNTU: [Config] Disable built-in SGX and enable CONFIG_DRM=m

At Ubuntu we use SGX as a external kernel module, provided by a
different package, so avoid having an incompatible driver pre-compiled.

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

1 files changed, 4 insertions, 6 deletions

diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu
index 59d08111aa4..03bf7bfffa4 100644
--- a/debian.ti-omap4/config/config.common.ubuntu
+++ b/debian.ti-omap4/config/config.common.ubuntu
@@ -670,7 +670,7 @@ CONFIG_DNOTIFY=y
 CONFIG_DNS_RESOLVER=y
 CONFIG_DONGLE=y
 CONFIG_DRAGONRISE_FF=y
-# CONFIG_DRM is not set
+CONFIG_DRM=m
 CONFIG_DS1682=m
 CONFIG_DUMMY=m
 CONFIG_DUMMY_CONSOLE=y
@@ -2594,12 +2594,11 @@ CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=y
 CONFIG_SGI_PARTITION=y
 # CONFIG_SGX530 is not set
-CONFIG_SGX540=y
+# CONFIG_SGX540 is not set
 # CONFIG_SGX_540_BUILD_DEBUG is not set
-CONFIG_SGX_540_BUILD_RELEASE=y
-# CONFIG_SGX_PDUMP is not set
+# CONFIG_SGX_540_BUILD_RELEASE is not set
 # CONFIG_SGX_REV110 is not set
-CONFIG_SGX_REV120=y
+# CONFIG_SGX_REV120 is not set
 CONFIG_SHMEM=y
 CONFIG_SIGMATEL_FIR=m
 CONFIG_SIGNALFD=y
@@ -3291,7 +3290,6 @@ CONFIG_VIDEO_V4L2_COMMON=y
 # CONFIG_VIDEO_VPFE_CAPTURE is not set
 CONFIG_VIDEO_W9966=m
 CONFIG_VIDEO_WM8775=m
-# CONFIG_VIRTUAL_DISPLAY_SUPPORT is not set
 CONFIG_VIRT_TO_BUS=y
 CONFIG_VITESSE_PHY=m
 CONFIG_VLAN_8021Q=m