aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2015-10-08 15:02:02 -0400
committerCatalin Marinas <catalin.marinas@arm.com>2015-10-12 11:19:33 -0400
commitd4dddfdbbc75f46d2cbab4e9f421999452617d64 (patch)
tree5a7ddde34abeb1d4eb1ac16d9d45544eff00beb2
parentcb50ce324e72bfd5d191d0a834a0ead1a08666b7 (diff)
arm64/efi: remove /chosen/linux, uefi-stub-kern-ver DT property
With the stub to kernel interface being promoted to a proper interface so that other agents than the stub can boot the kernel proper in EFI mode, we can remove the linux,uefi-stub-kern-ver field, considering that its original purpose was to prevent this from happening in the first place. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by: Matt Fleming <matt.fleming@intel.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r--Documentation/arm/uefi.txt2
-rw-r--r--drivers/firmware/efi/libstub/fdt.c9
2 files changed, 0 insertions, 11 deletions
diff --git a/Documentation/arm/uefi.txt b/Documentation/arm/uefi.txt
index d60030a1b909..7f1bed8872f3 100644
--- a/Documentation/arm/uefi.txt
+++ b/Documentation/arm/uefi.txt
@@ -58,7 +58,5 @@ linux,uefi-mmap-desc-size | 32-bit | Size in bytes of each entry in the UEFI
58-------------------------------------------------------------------------------- 58--------------------------------------------------------------------------------
59linux,uefi-mmap-desc-ver | 32-bit | Version of the mmap descriptor format. 59linux,uefi-mmap-desc-ver | 32-bit | Version of the mmap descriptor format.
60-------------------------------------------------------------------------------- 60--------------------------------------------------------------------------------
61linux,uefi-stub-kern-ver | string | Copy of linux_banner from build.
62--------------------------------------------------------------------------------
63 61
64For verbose debug messages, specify 'uefi_debug' on the kernel command line. 62For verbose debug messages, specify 'uefi_debug' on the kernel command line.
diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c
index ef5d764e2a27..b62e2f5dcab3 100644
--- a/drivers/firmware/efi/libstub/fdt.c
+++ b/drivers/firmware/efi/libstub/fdt.c
@@ -147,15 +147,6 @@ efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt,
147 if (status) 147 if (status)
148 goto fdt_set_fail; 148 goto fdt_set_fail;
149 149
150 /*
151 * Add kernel version banner so stub/kernel match can be
152 * verified.
153 */
154 status = fdt_setprop_string(fdt, node, "linux,uefi-stub-kern-ver",
155 linux_banner);
156 if (status)
157 goto fdt_set_fail;
158
159 return EFI_SUCCESS; 150 return EFI_SUCCESS;
160 151
161fdt_set_fail: 152fdt_set_fail: