1 files changed, 24 insertions, 1 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b649c5904a4f..8928b21a2dba 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -7,7 +7,6 @@ config ARM
         select HAVE_IDE if PCI || ISA || PCMCIA
         select HAVE_DMA_ATTRS
         select HAVE_DMA_CONTIGUOUS if (CPU_V6 || CPU_V6K || CPU_V7)
-        select CMA if (CPU_V6 || CPU_V6K || CPU_V7)
         select HAVE_MEMBLOCK
         select RTC_LIB
         select SYS_SUPPORTS_APM_EMULATION
@@ -46,6 +45,9 @@ config ARM
         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
@@ -294,6 +296,7 @@ config ARCH_VERSATILE
         select ICST
         select GENERIC_CLOCKEVENTS
         select ARCH_WANT_OPTIONAL_GPIOLIB
+        select NEED_MACH_IO_H if PCI
         select PLAT_VERSATILE
         select PLAT_VERSATILE_CLCD
         select PLAT_VERSATILE_FPGA_IRQ
@@ -589,6 +592,7 @@ config ARCH_ORION5X
         select PCI
         select ARCH_REQUIRE_GPIOLIB
         select GENERIC_CLOCKEVENTS
+        select NEED_MACH_IO_H
         select PLAT_ORION
         help
           Support for the following Marvell Orion 5x series SoCs:
@@ -1960,6 +1964,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.
 
+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 ""