Skip to contentSkip to conversation

MIPS: Octeon: Kconfig: fix helper dependency

PATCH NAK Antony Pavlov 2 participants 2 messages Feb 17, 2011 MIPS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MIPS: Octeon: Kconfig: fix helper dependency

The option CAVIUM_OCTEON_HELPER does not depend
on CPU_CAVIUM_OCTEON option.
So my .config file for MIPS Malta board contains

CONFIG_MIPS_MALTA=y
...
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
...
CONFIG_CAVIUM_OCTEON_HELPER=y

---
 arch/mips/cavium-octeon/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/mips/cavium-octeon/Kconfig +1 -1
index caae228..a6a2f3c 100644
@@ -97,7 +97,7 @@ config ARCH_SPARSEMEM_ENABLE
 
 config CAVIUM_OCTEON_HELPER
 	def_bool y
-	depends on OCTEON_ETHERNET || PCI
+	depends on CPU_CAVIUM_OCTEON && (OCTEON_ETHERNET || PCI)
 
 config IOMMU_HELPER
 	bool
Signature · 1 line
1.7.1
#1 lore raw
Quoted 4 lines · Antony Pavlov

The option CAVIUM_OCTEON_HELPER does not depend
on CPU_CAVIUM_OCTEON option.
So my .config file for MIPS Malta board contains

Quoted 8 lines

CONFIG_MIPS_MALTA=y
...
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
...
CONFIG_CAVIUM_OCTEON_HELPER=y

NAK.

I have a patch that takes a different approach.

David Daney

Quoted 17 lines
---
  arch/mips/cavium-octeon/Kconfig |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
arch/mips/cavium-octeon/Kconfig +1 -1
index caae228..a6a2f3c 100644
@@ -97,7 +97,7 @@ config ARCH_SPARSEMEM_ENABLE
 
  config CAVIUM_OCTEON_HELPER
  	def_bool y
-	depends on OCTEON_ETHERNET || PCI
+	depends on CPU_CAVIUM_OCTEON&&  (OCTEON_ETHERNET || PCI)
 
  config IOMMU_HELPER
  	bool