• Arnd Bergmann's avatar
    Merge tag 'kconfig-cleanup-for-3.15' of... · ead47a75
    Arnd Bergmann authored
    Merge tag 'kconfig-cleanup-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux into next/cleanup
    
    Merge "kconfig clean-up and mach-virt removal for 3.15" from Rob Herring
    
    - Remove common kconfig options required by multi-platform builds out
    of individual platforms as they are redundant.
    - Make SMP, CACHE_L2X0 and GPIO config options user visible on
    multi-platform builds as most platforms enable these options and all
    platforms can run with them enabled.
    - Make multi-platform v6 default to more optimal v6k rather than v6
    - Remove the last bit of mach-virt and convert it to just a kconfig
    option.
    
    * tag 'kconfig-cleanup-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
      ARM: virt: select ARM_AMBA
      ARM: virt: make mach-virt just a kconfig option
      ARM: vt8500: enable V6K instead of plain V6
      ARM: cns3xxx: enable V6K instead of plain V6
      ARM: bcm2835: enable V6K instead of plain V6
      ARM: Select V6K instead of V6 by default for multi-platform
      ARM: select MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform
      ARM: select HAVE_SMP for V7 multi-platform
      ARM: centralize common multi-platform kconfig options
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    ead47a75
Kconfig 66.2 KB