Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbf74077 authored by Colin Cross's avatar Colin Cross Committed by Alistair Strachan
Browse files

ANDROID: 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.

Bug: 120440972
Change-Id: I8416038498ddf8fc1e99ab06109825eb1492aa7f
Signed-off-by: default avatarColin Cross <ccross@android.com>
parent 2ad8e60c

arch/arm64/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -1239,6 +1239,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
@@ -1246,6 +1263,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