tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

MIPS: Octeon: Guard the Kconfig body with CPU_CAVIUM_OCTEON

Instead of making each Octeon specific option depend on
CPU_CAVIUM_OCTEON, gate the body of the entire file with
CPU_CAVIUM_OCTEON. With this change, CAVIUM_OCTEON_SPECIFIC_OPTIONS
becomes useless, so get rid of it as well.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2091/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

David Daney and committed by
Ralf Baechle 23a271ec e3fb3f27

+4 -11
+4 -11
arch/mips/cavium-octeon/Kconfig
··· 1 - config CAVIUM_OCTEON_SPECIFIC_OPTIONS 2 - bool "Enable Octeon specific options" 3 - depends on CPU_CAVIUM_OCTEON 4 - default "y" 1 + if CPU_CAVIUM_OCTEON 5 2 6 3 config CAVIUM_CN63XXP1 7 4 bool "Enable CN63XXP1 errata worarounds" 8 - depends on CAVIUM_OCTEON_SPECIFIC_OPTIONS 9 5 default "n" 10 6 help 11 7 The CN63XXP1 chip requires build time workarounds to ··· 12 16 13 17 config CAVIUM_OCTEON_2ND_KERNEL 14 18 bool "Build the kernel to be used as a 2nd kernel on the same chip" 15 - depends on CAVIUM_OCTEON_SPECIFIC_OPTIONS 16 19 default "n" 17 20 help 18 21 This option configures this kernel to be linked at a different ··· 21 26 22 27 config CAVIUM_OCTEON_HW_FIX_UNALIGNED 23 28 bool "Enable hardware fixups of unaligned loads and stores" 24 - depends on CAVIUM_OCTEON_SPECIFIC_OPTIONS 25 29 default "y" 26 30 help 27 31 Configure the Octeon hardware to automatically fix unaligned loads ··· 32 38 33 39 config CAVIUM_OCTEON_CVMSEG_SIZE 34 40 int "Number of L1 cache lines reserved for CVMSEG memory" 35 - depends on CAVIUM_OCTEON_SPECIFIC_OPTIONS 36 41 range 0 54 37 42 default 1 38 43 help ··· 43 50 44 51 config CAVIUM_OCTEON_LOCK_L2 45 52 bool "Lock often used kernel code in the L2" 46 - depends on CAVIUM_OCTEON_SPECIFIC_OPTIONS 47 53 default "y" 48 54 help 49 55 Enable locking parts of the kernel into the L2 cache. ··· 85 93 config ARCH_SPARSEMEM_ENABLE 86 94 def_bool y 87 95 select SPARSEMEM_STATIC 88 - depends on CPU_CAVIUM_OCTEON 89 96 90 97 config CAVIUM_OCTEON_HELPER 91 98 def_bool y ··· 98 107 99 108 config SWIOTLB 100 109 def_bool y 101 - depends on CPU_CAVIUM_OCTEON 102 110 select IOMMU_HELPER 103 111 select NEED_SG_DMA_LENGTH 112 + 113 + 114 + endif # CPU_CAVIUM_OCTEON