diff options
| author | Colin Cross <ccross@android.com> | 2014-04-02 18:02:15 -0700 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-21 22:35:44 -0500 |
| commit | efc7c9fc5318606a34e388e2d128246f87856ea8 (patch) | |
| tree | ad02b91296606ca78316ffe3efa14f6aed7ddb7c /arch | |
| parent | b71aff97e6062fc01f2d90ac1fc6351315fe19b2 (diff) | |
ARM64: copy CONFIG_CMDLINE_EXTEND from ARM
Copy the config choice for CONFIG_CMDLINE_EXTEND from
arch/arm/Kconfig, including CONFIG_CMDLINE_FROM_BOOTLOADER
as the default. These will be used by drivers/of/fdt.c.
Change-Id: I8416038498ddf8fc1e99ab06109825eb1492aa7f
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/Kconfig | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index b87502546318..02f4d1cfd7b3 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -194,6 +194,23 @@ config CMDLINE entering them here. As a minimum, you should specify the the root device (e.g. root=/dev/nfs). +choice + prompt "Kernel command line type" if CMDLINE != "" + default CMDLINE_FROM_BOOTLOADER + +config CMDLINE_FROM_BOOTLOADER + bool "Use bootloader kernel arguments if available" + help + Uses the command-line options passed by the boot loader. If + the boot loader doesn't provide any, the default kernel command + string provided in CMDLINE will be used. + +config CMDLINE_EXTEND + bool "Extend bootloader kernel arguments" + help + The command-line arguments provided by the boot loader will be + appended to the default kernel command string. + config CMDLINE_FORCE bool "Always use the default kernel command string" help @@ -201,6 +218,7 @@ config CMDLINE_FORCE 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. +endchoice config BUILD_ARM64_APPENDED_DTB_IMAGE bool "Build a concatenated Image.gz/dtb by default" |