* [PATCH] cavium-octeon: determine if helper should build
@ 2010-08-11 16:49 Andreas Bießmann
2010-08-11 16:55 ` David Daney
2010-08-17 14:34 ` Ralf Baechle
0 siblings, 2 replies; 3+ messages in thread
From: Andreas Bießmann @ 2010-08-11 16:49 UTC (permalink / raw)
To: linux-kernel; +Cc: Andreas Bießmann, Ralf Baechle, linux-mips
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>
---
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
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] cavium-octeon: determine if helper should build
2010-08-11 16:49 [PATCH] cavium-octeon: determine if helper should build Andreas Bießmann
@ 2010-08-11 16:55 ` David Daney
2010-08-17 14:34 ` Ralf Baechle
1 sibling, 0 replies; 3+ messages in thread
From: David Daney @ 2010-08-11 16:55 UTC (permalink / raw)
To: Andreas Bießmann; +Cc: linux-kernel, Ralf Baechle, linux-mips
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] cavium-octeon: determine if helper should build
2010-08-11 16:49 [PATCH] cavium-octeon: determine if helper should build Andreas Bießmann
2010-08-11 16:55 ` David Daney
@ 2010-08-17 14:34 ` Ralf Baechle
1 sibling, 0 replies; 3+ messages in thread
From: Ralf Baechle @ 2010-08-17 14:34 UTC (permalink / raw)
To: Andreas Bießmann; +Cc: linux-kernel, linux-mips
Applied.
Danke!
Ralf
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-08-17 14:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-11 16:49 [PATCH] cavium-octeon: determine if helper should build Andreas Bießmann
2010-08-11 16:55 ` David Daney
2010-08-17 14:34 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox