From patchwork Wed Mar 27 15:21:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 231728 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id D948C2C009D for ; Thu, 28 Mar 2013 02:21:24 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UKsA6-0005i3-Nd; Wed, 27 Mar 2013 15:21:14 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UKs9z-0005ha-HK for kernel-team@lists.ubuntu.com; Wed, 27 Mar 2013 15:21:07 +0000 Received: from 2-230-238-136.ip204.fastwebnet.it ([2.230.238.136] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1UKs9z-0007Xf-DD for kernel-team@lists.ubuntu.com; Wed, 27 Mar 2013 15:21:07 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: [Config] disable OMAP2PLUS_CPUFREQ Date: Wed, 27 Mar 2013 16:21:04 +0100 Message-Id: <1364397664-19121-3-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1364397664-19121-1-git-send-email-paolo.pisati@canonical.com> References: <1364397664-19121-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com More info here: https://lkml.org/lkml/2013/1/27/114 Signed-off-by: Paolo Pisati --- debian.master/config/amd64/config.common.amd64 | 2 -- debian.master/config/armhf/config.common.armhf | 2 -- debian.master/config/config.common.ubuntu | 4 +++- debian.master/config/i386/config.common.i386 | 2 -- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 5e3e1a6..815f1e7 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -14,7 +14,6 @@ CONFIG_AUDIT_ARCH=y CONFIG_BCH=m # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -# CONFIG_CPU_IDLE_CALXEDA is not set # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_DM_RAID45=m @@ -83,7 +82,6 @@ CONFIG_SOUND=m CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPI_PXA2XX_PCI=m # CONFIG_STANDALONE is not set -# CONFIG_SWP_EMULATE is not set CONFIG_USB_ARCH_HAS_XHCI=y CONFIG_USB_CHIPIDEA=m CONFIG_USB_EHCI_HCD_PLATFORM=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index fb35fe2..be7ca03 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -9,7 +9,6 @@ CONFIG_ASYNC_TX_DMA=y CONFIG_BCH=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -CONFIG_CPU_IDLE_CALXEDA=y CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_DM_RAID45 is not set @@ -75,7 +74,6 @@ CONFIG_SND_TIMER=y CONFIG_SOUND=y # CONFIG_SPI_PXA2XX_PCI is not set CONFIG_STANDALONE=y -CONFIG_SWP_EMULATE=y # CONFIG_USB_ARCH_HAS_XHCI is not set CONFIG_USB_CHIPIDEA=y # CONFIG_USB_EHCI_HCD_PLATFORM is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 30c6fcf..e2e3232 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -370,7 +370,7 @@ CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_L1_CACHE_SHIFT_6=y # CONFIG_ARM_LPAE is not set CONFIG_ARM_NR_BANKS=8 -CONFIG_ARM_OMAP2PLUS_CPUFREQ=y +# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_ARM_SP805_WATCHDOG=m CONFIG_ARM_THUMB=y @@ -1103,6 +1103,7 @@ CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_HAS_ASID=y # CONFIG_CPU_ICACHE_DISABLE is not set CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_CALXEDA=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_CPU_NOTIFIER_ERROR_INJECT=m @@ -5698,6 +5699,7 @@ CONFIG_SUSPEND_FREEZER=y CONFIG_SWAP=y CONFIG_SWIOTLB=y CONFIG_SWIOTLB_XEN=y +CONFIG_SWP_EMULATE=y CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m CONFIG_SYNCLINK_CS=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index c18108c..1b08238 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -13,7 +13,6 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_BCH=m # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -# CONFIG_CPU_IDLE_CALXEDA is not set # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_DM_RAID45=m @@ -82,7 +81,6 @@ CONFIG_SOUND=m # CONFIG_SPARSEMEM_MANUAL is not set CONFIG_SPI_PXA2XX_PCI=m # CONFIG_STANDALONE is not set -# CONFIG_SWP_EMULATE is not set CONFIG_USB_ARCH_HAS_XHCI=y CONFIG_USB_CHIPIDEA=m CONFIG_USB_EHCI_HCD_PLATFORM=y