From: Colin Cross Date: Thu, 3 Apr 2014 01:02:15 +0000 (-0700) Subject: ARM64: copy CONFIG_CMDLINE_EXTEND from ARM X-Git-Tag: firefly_0821_release~2958^2~114 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=19329cdd0d6c9fd596959f00a5d66d5b4603fb6c;p=firefly-linux-kernel-4.4.55.git 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 --- diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 77ea4f6b656e..68e3e35f1965 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -720,6 +720,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 @@ -727,6 +744,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 EFI_STUB bool