1 files changed, 22 insertions, 9 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 48c19d44be9a..117e81b12009 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -16,6 +16,7 @@ config ARM
         select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
         select HAVE_ARCH_KGDB
         select HAVE_ARCH_TRACEHOOK
+        select HAVE_SYSCALL_TRACEPOINTS
         select HAVE_KPROBES if !XIP_KERNEL
         select HAVE_KRETPROBES if (HAVE_KPROBES)
         select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
@@ -1859,8 +1860,8 @@ config ALIGNMENT_TRAP
           configuration it is safe to say N, otherwise say Y.
 
 config UACCESS_WITH_MEMCPY
-        bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user() (EXPERIMENTAL)"
-        depends on MMU && EXPERIMENTAL
+        bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
+        depends on MMU
         default y if CPU_FEROCEON
         help
           Implement faster copy_to_user and clear_user methods for CPU
@@ -1901,12 +1902,6 @@ config CC_STACKPROTECTOR
           neutralized via a kernel panic.
           This feature requires gcc version 4.2 or above.
 
-config DEPRECATED_PARAM_STRUCT
-        bool "Provide old way to pass kernel parameters"
-        help
-          This was deprecated in 2001 and announced to live on for 5 years.
-          Some old boot loaders still use this way.
-
 endmenu
 
 menu "Boot options"
@@ -1919,6 +1914,23 @@ config USE_OF
         help
           Include support for flattened device tree machine descriptions.
 
+config ATAGS
+        bool "Support for the traditional ATAGS boot data passing" if USE_OF
+        default y
+        help
+          This is the traditional way of passing data to the kernel at boot
+          time. If you are solely relying on the flattened device tree (or
+          the ARM_ATAG_DTB_COMPAT option) then you may unselect this option
+          to remove ATAGS support from your kernel binary.  If unsure,
+          leave this to y.
+
+config DEPRECATED_PARAM_STRUCT
+        bool "Provide old way to pass kernel parameters"
+        depends on ATAGS
+        help
+          This was deprecated in 2001 and announced to live on for 5 years.
+          Some old boot loaders still use this way.
+
 # Compressed boot loader in ROM.  Yes, we really want to ask about
 # TEXT and BSS so we preserve their values in the config files.
 config ZBOOT_ROM_TEXT
@@ -2045,6 +2057,7 @@ config CMDLINE
 choice
         prompt "Kernel command line type" if CMDLINE != ""
         default CMDLINE_FROM_BOOTLOADER
+        depends on ATAGS
 
 config CMDLINE_FROM_BOOTLOADER
         bool "Use bootloader kernel arguments if available"
@@ -2114,7 +2127,7 @@ config KEXEC
 
 config ATAGS_PROC
         bool "Export atags in procfs"
-        depends on KEXEC
+        depends on ATAGS && KEXEC
         default y
         help
           Should the atags used to boot the kernel be exported in an "atags"