From patchwork Wed Jun 9 16:08:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 55110 X-Patchwork-Delegate: leann.ogasawara@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 39B1CB7D61 for ; Thu, 10 Jun 2010 02:08:58 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OMNpl-0007KO-57; Wed, 09 Jun 2010 17:08:53 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OMNpk-0007K8-5H for kernel-team@lists.ubuntu.com; Wed, 09 Jun 2010 17:08:52 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OMNpk-0007Je-3w for ; Wed, 09 Jun 2010 17:08:52 +0100 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OMNpj-0002P5-O6 for kernel-team@lists.ubuntu.com; Wed, 09 Jun 2010 17:08:52 +0100 Subject: [PATCH 1/2] UBUNTU: [Config] armel: Enable CONFIG_BNX2=m From: Leann Ogasawara To: kernel-team In-Reply-To: <1276099620.1221.49.camel@emiko> References: <1276099620.1221.49.camel@emiko> Date: Wed, 09 Jun 2010 09:08:38 -0700 Message-ID: <1276099718.1221.54.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 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 >From 3264d81cd872dfd2720c887d096bd361e01b1014 Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Wed, 9 Jun 2010 08:47:42 -0700 Subject: [PATCH 1/2] UBUNTU: [Config] armel: Enable CONFIG_BNX2=m Without this module being enabled, we experience armel build failures: missing firmware bnx2/bnx2-mips-06-5.0.0.j6.fw missing firmware bnx2/bnx2-mips-09-5.0.0.j15.fw missing firmware bnx2/bnx2-rv2p-06-5.0.0.j3.fw missing firmware bnx2/bnx2-rv2p-09-5.0.0.j10.fw missing firmware bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw missing firmware bnx2/bnx2-mips-06-5.0.0.j6.fw missing firmware bnx2/bnx2-mips-09-5.0.0.j15.fw missing firmware bnx2/bnx2-rv2p-06-5.0.0.j3.fw missing firmware bnx2/bnx2-rv2p-09-5.0.0.j10.fw missing firmware bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw command exited with status 1 make[1]: *** [do-binary-udebs] Error 2 Signed-off-by: Leann Ogasawara --- 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 - 4 files changed, 1 insertions(+), 3 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index e606692..aaf1ee6 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -20,7 +20,6 @@ CONFIG_AUDIT_ARCH=y CONFIG_B43=m CONFIG_B43LEGACY=m CONFIG_B44=m -CONFIG_BNX2=m CONFIG_BT=m # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_CDROM_PKTCDVD=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index eb97ea5..c803e58 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -7,7 +7,6 @@ CONFIG_ASYNC_TX_DMA=y CONFIG_ATM_BR2684_IPFILTER=y CONFIG_ATM_DUMMY=m -# CONFIG_BNX2 is not set # CONFIG_CNIC is not set # CONFIG_COMEDI is not set CONFIG_DEFAULT_CFQ=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 1559932..e77a720 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -447,6 +447,7 @@ CONFIG_BLK_DEV_UMEM=m # CONFIG_BLK_DEV_XIP is not set CONFIG_BLOCK=y CONFIG_BLOCK_COMPAT=y +CONFIG_BNX2=m CONFIG_BNX2X=m CONFIG_BONDING=m # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index e99ff35..69153b3 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -18,7 +18,6 @@ CONFIG_ATM=m CONFIG_B43=m CONFIG_B43LEGACY=m CONFIG_B44=m -CONFIG_BNX2=m CONFIG_BT=m # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_CDROM_PKTCDVD=y