Merge tag 'v3.6-rc2' into drm-intel-next

[firefly-linux-kernel-4.4.55.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b25c9d3c379a74701dddc777b7077f2a9478d0cd..e91c7cdc6fe5c5ae370fa8be0f3a3c51a0b49beb 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -11,6 +11,7 @@ config ARM
        select RTC_LIB
        select SYS_SUPPORTS_APM_EMULATION
        select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI)
        select RTC_LIB
        select SYS_SUPPORTS_APM_EMULATION
        select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI)

+       select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

        select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
        select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
        select HAVE_ARCH_KGDB
        select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
        select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
        select HAVE_ARCH_KGDB


@@ -38,6 +39,7 @@ config ARM
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
        select GENERIC_IRQ_PROBE

+       select ARCH_WANT_IPC_PARSE_VERSION

        select HARDIRQS_SW_RESEND
        select CPU_PM if (SUSPEND || CPU_IDLE)
        select GENERIC_PCI_IOMAP
        select HARDIRQS_SW_RESEND
        select CPU_PM if (SUSPEND || CPU_IDLE)
        select GENERIC_PCI_IOMAP


@@ -45,6 +47,9 @@ config ARM
        select GENERIC_SMP_IDLE_THREAD
        select KTIME_SCALAR
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
        select GENERIC_SMP_IDLE_THREAD
        select KTIME_SCALAR
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP

+       select GENERIC_STRNCPY_FROM_USER
+       select GENERIC_STRNLEN_USER
+       select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN

        help
          The ARM series is a line of low-power-consumption RISC chip designs
          licensed by ARM Ltd and targeted at embedded applications and
        help
          The ARM series is a line of low-power-consumption RISC chip designs
          licensed by ARM Ltd and targeted at embedded applications and


@@ -279,7 +284,6 @@ config ARCH_INTEGRATOR
        select ICST
        select GENERIC_CLOCKEVENTS
        select PLAT_VERSATILE
        select ICST
        select GENERIC_CLOCKEVENTS
        select PLAT_VERSATILE

-       select PLAT_VERSATILE_CLOCK

        select PLAT_VERSATILE_FPGA_IRQ
        select NEED_MACH_IO_H
        select NEED_MACH_MEMORY_H
        select PLAT_VERSATILE_FPGA_IRQ
        select NEED_MACH_IO_H
        select NEED_MACH_MEMORY_H


@@ -336,7 +340,6 @@ config ARCH_VEXPRESS
        select ICST
        select NO_IOPORT
        select PLAT_VERSATILE
        select ICST
        select NO_IOPORT
        select PLAT_VERSATILE

-       select PLAT_VERSATILE_CLOCK

        select PLAT_VERSATILE_CLCD
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
        help
        select PLAT_VERSATILE_CLCD
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
        help


@@ -1008,7 +1011,6 @@ config ARCH_VT8500
        select ARCH_HAS_CPUFREQ
        select GENERIC_CLOCKEVENTS
        select ARCH_REQUIRE_GPIOLIB
        select ARCH_HAS_CPUFREQ
        select GENERIC_CLOCKEVENTS
        select ARCH_REQUIRE_GPIOLIB

-       select HAVE_PWM

        help
          Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
 
        help
          Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
 


@@ -1149,6 +1151,7 @@ config PLAT_ORION
        bool
        select CLKSRC_MMIO
        select GENERIC_IRQ_CHIP
        bool
        select CLKSRC_MMIO
        select GENERIC_IRQ_CHIP

+       select IRQ_DOMAIN

        select COMMON_CLK
 
 config PLAT_PXA
        select COMMON_CLK
 
 config PLAT_PXA


@@ -2006,6 +2009,25 @@ config ARM_ATAG_DTB_COMPAT
          bootloaders, this option allows zImage to extract the information
          from the ATAG list and store it at run time into the appended DTB.
 
          bootloaders, this option allows zImage to extract the information
          from the ATAG list and store it at run time into the appended DTB.
 

+choice
+       prompt "Kernel command line type" if ARM_ATAG_DTB_COMPAT
+       default ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER
+
+config ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER
+       bool "Use bootloader kernel arguments if available"
+       help
+         Uses the command-line options passed by the boot loader instead of
+         the device tree bootargs property. If the boot loader doesn't provide
+         any, the device tree bootargs property will be used.
+
+config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND
+       bool "Extend with bootloader kernel arguments"
+       help
+         The command-line arguments provided by the boot loader will be
+         appended to the the device tree bootargs property.
+
+endchoice
+

 config CMDLINE
        string "Default kernel command string"
        default ""
 config CMDLINE
        string "Default kernel command string"
        default ""