diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 18:08:54 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 18:08:54 -0400 |
| commit | f949c0edd84101bfd30b3e7389c1a12b067e561d (patch) | |
| tree | ba39033c089a66a8d4ac058f3f03a8ed2a488f91 /arch/arm/Kconfig | |
| parent | 119c4b1257e44d9ec981465ccb80aba427a96dda (diff) | |
| parent | 92d2040d78f662f634efce7a5106bbed70b8708b (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 62065531b639..1f254bd6c937 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1421,6 +1421,17 @@ config CMDLINE | |||
| 1421 | time by entering them here. As a minimum, you should specify the | 1421 | time by entering them here. As a minimum, you should specify the |
| 1422 | memory size and the root device (e.g., mem=64M root=/dev/nfs). | 1422 | memory size and the root device (e.g., mem=64M root=/dev/nfs). |
| 1423 | 1423 | ||
| 1424 | config CMDLINE_FORCE | ||
| 1425 | bool "Always use the default kernel command string" | ||
| 1426 | depends on CMDLINE != "" | ||
| 1427 | help | ||
| 1428 | Always use the default kernel command string, even if the boot | ||
| 1429 | loader passes other arguments to the kernel. | ||
| 1430 | This is useful if you cannot or don't want to change the | ||
| 1431 | command-line options your boot loader passes to the kernel. | ||
| 1432 | |||
| 1433 | If unsure, say N. | ||
| 1434 | |||
| 1424 | config XIP_KERNEL | 1435 | config XIP_KERNEL |
| 1425 | bool "Kernel Execute-In-Place from ROM" | 1436 | bool "Kernel Execute-In-Place from ROM" |
| 1426 | depends on !ZBOOT_ROM | 1437 | depends on !ZBOOT_ROM |