Original EFI stub code parses command line, using old configs: CMDLINE, CMDLINE_EXTEND and CMDLINE_FORCE. New generic builtin command line use new configs: CMDLINE_PREPEND, CMDLINE_APPEND and CMDLINE_OVERRIDE, which depend on CMDLINE_BOOL. Cc: Daniel Walker <dwalker@xxxxxxxxxx> Cc: Daniel Walker <danielwa@xxxxxxxxx> Signed-off-by: Maksym Kokhan <maksym.kokhan@xxxxxxxxxxxxxxx> --- drivers/firmware/efi/libstub/arm-stub.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c index 6920033..40396e1 100644 --- a/drivers/firmware/efi/libstub/arm-stub.c +++ b/drivers/firmware/efi/libstub/arm-stub.c @@ -146,12 +146,12 @@ unsigned long efi_entry(void *handle, efi_system_table_t *sys_table, goto fail; } - if (IS_ENABLED(CONFIG_CMDLINE_EXTEND) || - IS_ENABLED(CONFIG_CMDLINE_FORCE) || - cmdline_size == 0) - efi_parse_options(CONFIG_CMDLINE); + #if IS_ENABLED(CONFIG_CMDLINE_BOOL) + efi_parse_options(CONFIG_CMDLINE_PREPEND); + efi_parse_options(CONFIG_CMDLINE_APPEND); + #endif - if (!IS_ENABLED(CONFIG_CMDLINE_FORCE) && cmdline_size > 0) + if (!IS_ENABLED(CONFIG_CMDLINE_OVERRIDE) && cmdline_size > 0) efi_parse_options(cmdline_ptr); pr_efi(sys_table, "Booting Linux Kernel...\n"); -- 2.7.4
