diff options
| author | Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> | 2014-10-13 11:17:10 -0500 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2014-10-14 10:18:05 +0100 |
| commit | b095ec3d8828cbc063098d57be5fbf6d7dd2fac8 (patch) | |
| tree | ed7d11a1f909fb8be7150a2fe2854c0b4c649a1d | |
| parent | 254ddde3799c73ebc35c995fe63396a8dd17f339 (diff) | |
xen: arm: Do not enable EFI in dom0 since it is not yet supported.
Since EFI is not yet supported in dom0, we need to remove the following
properties from the chosen node:
* linux,uefi-mmap-start
* linux,uefi-mmap-size
* linux,uefi-mmap-desc-size
* linux,uefi-mmap-desc-ver
These are added by "arch/arm/efi/efi-boot.h: fdt_add_uefi_nodes()",
and used by dom0 kernel to enable EFI.
Cc: Julien Grall <julien.grall@linaro.org>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Roy Franz <roy.franz@linaro.org>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Reviewed-by: Julien Grall <julien.grall@linaro.org>
Reviewed-by: Roy Franz <roy.franz@linaro.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
| -rw-r--r-- | xen/arch/arm/domain_build.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 138ca89a30..5aca925a20 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -424,12 +424,21 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, * bootargs (from module #1, above). * * remove bootargs, xen,dom0-bootargs, xen,xen-bootargs, * linux,initrd-start and linux,initrd-end. + * * remove bootargs, linux,uefi-system-table, + * linux,uefi-mmap-start, linux,uefi-mmap-size, + * linux,uefi-mmap-desc-size, and linux,uefi-mmap-desc-ver + * (since EFI boot is not currently supported in dom0). */ if ( dt_node_path_is_equal(node, "/chosen") ) { if ( dt_property_name_is_equal(prop, "xen,xen-bootargs") || dt_property_name_is_equal(prop, "linux,initrd-start") || - dt_property_name_is_equal(prop, "linux,initrd-end") ) + dt_property_name_is_equal(prop, "linux,initrd-end") || + dt_property_name_is_equal(prop, "linux,uefi-system-table") || + dt_property_name_is_equal(prop, "linux,uefi-mmap-start") || + dt_property_name_is_equal(prop, "linux,uefi-mmap-size") || + dt_property_name_is_equal(prop, "linux,uefi-mmap-desc-size") || + dt_property_name_is_equal(prop, "linux,uefi-mmap-desc-ver")) continue; if ( dt_property_name_is_equal(prop, "xen,dom0-bootargs") ) |