From patchwork Mon Mar 22 10:17:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lo=C3=AFc_Minier?= X-Patchwork-Id: 48277 X-Patchwork-Delegate: stefan.bader@canonical.com 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 D3FA0B7CFA for ; Mon, 22 Mar 2010 21:17:52 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Ntehb-0001xM-Us; Mon, 22 Mar 2010 10:17:43 +0000 Received: from duck.dooz.org ([194.146.227.125]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Nteha-0001x1-95 for kernel-team@lists.ubuntu.com; Mon, 22 Mar 2010 10:17:42 +0000 Received: from bee.dooz.org (serris.dooz.org [88.166.229.232]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by duck.dooz.org (Postfix) with ESMTP id E4945C809C; Mon, 22 Mar 2010 11:17:41 +0100 (CET) Received: by bee.dooz.org (Postfix, from userid 1000) id 3C5B75B84; Mon, 22 Mar 2010 11:17:40 +0100 (CET) From: =?UTF-8?q?Lo=C3=AFc=20Minier?= To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] UBUNTU: [Config] armel/versatile: Set CRAMFS=m Date: Mon, 22 Mar 2010 11:17:37 +0100 Message-Id: <1269253058-8131-1-git-send-email-loic.minier@ubuntu.com> X-Mailer: git-send-email 1.7.0 MIME-Version: 1.0 Cc: =?UTF-8?q?Lo=C3=AFc=20Minier?= X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Revert CRAMFS=y from 553a4be9cb569e6e895c892709163b5c5aaf7463 as support for initramfses with very large kernels has been fixed in qemu-kvm and initrds didn't work any better than initramfses anyway. BugLink: http://bugs.launchpad.net/bugs/524893 Signed-off-by: Loïc Minier Acked-by: Amit Kucheria Acked-by: Stefan Bader --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/armel/config.common.armel | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/i386/config.common.i386 | 1 - debian.master/config/lpia/config.common.lpia | 1 - 5 files changed, 1 insertions(+), 4 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 110f377..b57c89f 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -20,7 +20,6 @@ CONFIG_B44=m CONFIG_BT=m # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_CDROM_PKTCDVD=y -CONFIG_CRAMFS=m CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_DRM_RADEON=m CONFIG_FB_BOOT_VESA_SUPPORT=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 3103939..b2732af 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -12,7 +12,6 @@ # CONFIG_BT is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_CDROM_PKTCDVD is not set -CONFIG_CRAMFS=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="cfq" diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index c1ab99e..bc2185e 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -611,6 +611,7 @@ CONFIG_CPU_SUP_TRANSMETA_32=y CONFIG_CPU_SUP_UMC_32=y CONFIG_CPU_TLB_V7=y CONFIG_CPU_V7=y +CONFIG_CRAMFS=m CONFIG_CRASH_DUMP=y CONFIG_CRC16=y CONFIG_CRC32=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index feed603..9f6db3b 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -18,7 +18,6 @@ CONFIG_B44=m CONFIG_BT=m # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_CDROM_PKTCDVD=y -CONFIG_CRAMFS=m CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_DRM_RADEON=m CONFIG_FB_BOOT_VESA_SUPPORT=y diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia index ca7f6d1..d7370f2 100644 --- a/debian.master/config/lpia/config.common.lpia +++ b/debian.master/config/lpia/config.common.lpia @@ -19,7 +19,6 @@ CONFIG_B44=m CONFIG_BT=m # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_CDROM_PKTCDVD=y -CONFIG_CRAMFS=m CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="cfq"