linux-mips
[Top] [All Lists]

Re: [PATCH] cavium-octeon: determine if helper should build

To: Andreas Bießmann <biessmann@corscience.de>
Subject: Re: [PATCH] cavium-octeon: determine if helper should build
From: David Daney <ddaney@caviumnetworks.com>
Date: Wed, 11 Aug 2010 09:55:50 -0700
Cc: linux-kernel@vger.kernel.org, Ralf Baechle <ralf@linux-mips.org>, linux-mips@linux-mips.org
In-reply-to: <1281545393-23690-1-git-send-email-biessmann@corscience.de>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1281545393-23690-1-git-send-email-biessmann@corscience.de>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.11) Gecko/20100720 Fedora/3.0.6-1.fc12 Thunderbird/3.0.6
On 08/11/2010 09:49 AM, Andreas Bießmann wrote:
  This patch adds an config switch to determine if we need to build some
  workaround helper files.

  The staging driver octeon-ethernet references some symbols which are only
  built when PCI is enabled. The new config switch enables these symbols in
  bothe cases.

Signed-off-by: Andreas Bießmann<biessmann@corscience.de>

Acked-by: David Daney <ddaney@caviumnetworks.com>


---
  arch/mips/cavium-octeon/Kconfig            |    4 ++++
  arch/mips/cavium-octeon/executive/Makefile |    2 +-
  2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/arch/mips/cavium-octeon/Kconfig b/arch/mips/cavium-octeon/Kconfig
index 094c17e..47323ca 100644
--- a/arch/mips/cavium-octeon/Kconfig
+++ b/arch/mips/cavium-octeon/Kconfig
@@ -83,3 +83,7 @@ config ARCH_SPARSEMEM_ENABLE
        def_bool y
        select SPARSEMEM_STATIC
        depends on CPU_CAVIUM_OCTEON
+
+config CAVIUM_OCTEON_HELPER
+       def_bool y
+       depends on OCTEON_ETHERNET || PCI
diff --git a/arch/mips/cavium-octeon/executive/Makefile 
b/arch/mips/cavium-octeon/executive/Makefile
index 2fd66db..7f41c5b 100644
--- a/arch/mips/cavium-octeon/executive/Makefile
+++ b/arch/mips/cavium-octeon/executive/Makefile
@@ -11,4 +11,4 @@

  obj-y += cvmx-bootmem.o cvmx-l2c.o cvmx-sysinfo.o octeon-model.o

-obj-$(CONFIG_PCI) += cvmx-helper-errata.o cvmx-helper-jtag.o
+obj-$(CONFIG_CAVIUM_OCTEON_HELPER) += cvmx-helper-errata.o cvmx-helper-jtag.o


<Prev in Thread] Current Thread [Next in Thread>