aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-05-24 23:08:54 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-24 23:08:54 +0100
commitf949c0edd84101bfd30b3e7389c1a12b067e561d (patch)
treeba39033c089a66a8d4ac058f3f03a8ed2a488f91 /arch/arm/Kconfig
parent119c4b1257e44d9ec981465ccb80aba427a96dda (diff)
parent92d2040d78f662f634efce7a5106bbed70b8708b (diff)
downloadkernel_samsung_aries-f949c0edd84101bfd30b3e7389c1a12b067e561d.zip
kernel_samsung_aries-f949c0edd84101bfd30b3e7389c1a12b067e561d.tar.gz
kernel_samsung_aries-f949c0edd84101bfd30b3e7389c1a12b067e561d.tar.bz2
Merge branch 'master' into devel
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6206553..1f254bd 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1421,6 +1421,17 @@ config CMDLINE
time by entering them here. As a minimum, you should specify the
memory size and the root device (e.g., mem=64M root=/dev/nfs).
+config CMDLINE_FORCE
+ bool "Always use the default kernel command string"
+ depends on CMDLINE != ""
+ help
+ Always use the default kernel command string, even if the boot
+ loader passes other arguments to the kernel.
+ This is useful if you cannot or don't want to change the
+ command-line options your boot loader passes to the kernel.
+
+ If unsure, say N.
+
config XIP_KERNEL
bool "Kernel Execute-In-Place from ROM"
depends on !ZBOOT_ROM