Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

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

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 9063ae6553ccb7a0a220b8db667ac770627addbf..9be30c8cb0c22d36438c11b50ce21e8d6ae76463 100644 (file)
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -128,8 +128,8 @@ config SMP
        default n
        help
          This enables support for systems with more than one CPU. If you have
-         a system with only one CPU, like most personal computers, say N. If
-         you have a system with more than one CPU, say Y.
+         a system with only one CPU, say N. If you have a system with more
+         than one CPU, say Y.
 
 if SMP
 
@@ -409,17 +409,6 @@ config ARC_DBG_TLB_MISS_COUNT
          Counts number of I and D TLB Misses and exports them via Debugfs
          The counters can be cleared via Debugfs as well
 
-config CMDLINE_UBOOT
-       bool "Support U-boot kernel command line passing"
-       default n
-       help
-         If you are using U-boot (www.denx.de) and wish to pass the kernel
-         command line from the U-boot environment to the Linux kernel then
-         switch this option on.
-         ARC U-boot will setup the cmdline in RAM/flash and set r2 to point
-         to it. kernel startup code will append this to DeviceTree
-         /bootargs provided cmdline args.
-
 config ARC_BUILTIN_DTB_NAME
        string "Built in DTB"
        help