From patchwork Fri Aug 19 09:58:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 110580 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 2F834B6F7C for ; Fri, 19 Aug 2011 19:58:31 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QuLqC-0005WW-Up; Fri, 19 Aug 2011 09:58:16 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QuLqA-0005WI-ON for kernel-team@lists.ubuntu.com; Fri, 19 Aug 2011 09:58:14 +0000 Received: from dynamic-adsl-94-36-139-55.clienti.tiscali.it ([94.36.139.55] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1QuLqA-0007WO-IW; Fri, 19 Aug 2011 09:58:14 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: [Config] Disable built-in SGX and enable CONFIG_DRM=m Date: Fri, 19 Aug 2011 11:58:10 +0200 Message-Id: <1313747890-5341-3-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1313747890-5341-1-git-send-email-paolo.pisati@canonical.com> References: <1313747890-5341-1-git-send-email-paolo.pisati@canonical.com> Cc: Ricardo Salveti de Araujo X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Ricardo Salveti de Araujo 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 Signed-off-by: Paolo Pisati --- debian.ti-omap4/config/config.common.ubuntu | 10 ++++------ 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 59d0811..03bf7bf 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