7e98da058f
This change reorganizes and cleanups our patches to reduce the patch number from 314 patches to 187. That's achieved by dropping patches that are later reverted and squashing fixes for earlier patches that introduced features. There are no code changes and the diff with upstream is the same before and after the cleanup. Having fewer patches makes easier to manage the patchset and also will ease to rebase them on top of the latest grub-2.04 release. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Mark Salter <msalter@redhat.com>
|
|
Date: Mon, 17 Apr 2017 08:44:29 -0400
|
|
Subject: [PATCH] arm64: make sure fdt has #address-cells and #size-cells
|
|
properties
|
|
|
|
Recent upstream changes to kexec-tools relies on #address-cells
|
|
and #size-cells properties in the FDT. If grub2 needs to create
|
|
a chosen node, it is likely because firmware did not provide one.
|
|
In that case, set #address-cells and #size-cells properties to
|
|
make sure they exist.
|
|
---
|
|
grub-core/loader/arm64/linux.c | 16 +++++++++++++++-
|
|
1 file changed, 15 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
|
|
index a1ac7a38867..93b5cd306eb 100644
|
|
--- a/grub-core/loader/arm64/linux.c
|
|
+++ b/grub-core/loader/arm64/linux.c
|
|
@@ -80,7 +80,21 @@ finalize_params_linux (void)
|
|
|
|
node = grub_fdt_find_subnode (fdt, 0, "chosen");
|
|
if (node < 0)
|
|
- node = grub_fdt_add_subnode (fdt, 0, "chosen");
|
|
+ {
|
|
+ /*
|
|
+ * If we have to create a chosen node, Make sure we
|
|
+ * have #address-cells and #size-cells properties.
|
|
+ */
|
|
+ retval = grub_fdt_set_prop32(fdt, 0, "#address-cells", 2);
|
|
+ if (retval)
|
|
+ goto failure;
|
|
+
|
|
+ retval = grub_fdt_set_prop32(fdt, 0, "#size-cells", 2);
|
|
+ if (retval)
|
|
+ goto failure;
|
|
+
|
|
+ node = grub_fdt_add_subnode (fdt, 0, "chosen");
|
|
+ }
|
|
|
|
if (node < 1)
|
|
goto failure;
|