diff options
| author | Leif Lindholm <leif.lindholm@linaro.org> | 2015-08-26 14:24:56 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2015-10-12 14:20:05 +0100 |
| commit | 12dd00e83fb83fa41dcc965cdd1e1627494348cb (patch) | |
| tree | 02824c0cacd5941a2c5530d1c81ffcd47c436ed4 | |
| parent | 18aefbc5cc075617b00ffefba70029541e18fd1a (diff) | |
| download | blackbird-op-linux-12dd00e83fb83fa41dcc965cdd1e1627494348cb.tar.gz blackbird-op-linux-12dd00e83fb83fa41dcc965cdd1e1627494348cb.zip | |
efi/x86: Move efi=debug option parsing to core
fed6cefe3b6e ("x86/efi: Add a "debug" option to the efi= cmdline")
adds the DBG flag, but does so for x86 only. Move this early param
parsing to core code.
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Mark Salter <msalter@redhat.com>
Cc: Borislav Petkov <bp@suse.de>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| -rw-r--r-- | arch/x86/platform/efi/efi.c | 2 | ||||
| -rw-r--r-- | drivers/firmware/efi/efi.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 2f61fcddcddb..4d0ff0f27a99 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -961,8 +961,6 @@ static int __init arch_parse_efi_cmdline(char *str) if (parse_option_str(str, "old_map")) set_bit(EFI_OLD_MEMMAP, &efi.flags); - if (parse_option_str(str, "debug")) - set_bit(EFI_DBG, &efi.flags); return 0; } diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 16c4928e36af..f0372a022c86 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -63,6 +63,9 @@ static int __init parse_efi_cmdline(char *str) return -EINVAL; } + if (parse_option_str(str, "debug")) + set_bit(EFI_DBG, &efi.flags); + if (parse_option_str(str, "noruntime")) disable_runtime = true; |
