summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorAlexander Holler <holler@ahsoftware.de>2010-02-16 19:04:53 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-24 20:45:00 +0100
commit92d2040d78f662f634efce7a5106bbed70b8708b (patch)
tree15ab19b8d528b7ffb42e3b39f3db7e4b67ceec70 /arch/arm/Kconfig
parent830703c766ed49bc740321df55a11d19154f95d5 (diff)
downloadop-kernel-dev-92d2040d78f662f634efce7a5106bbed70b8708b.zip
op-kernel-dev-92d2040d78f662f634efce7a5106bbed70b8708b.tar.gz
ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline
Add an option to force usage of the in-kernel cmdline even if the boot loader passes another command string to the kernel. Useful if someone cannot or don't want to change the command-line options of the boot loader but is able to change the kernel. Signed-off-by: Alexander Holler <holler@ahsoftware.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
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 2d70cec..8555bd7 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1419,6 +1419,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
OpenPOWER on IntegriCloud