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 <[email protected]>
---
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
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<[email protected]>
Acked-by: David Daney <[email protected]>
> ---
> 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