d108ec594a
- Introduces a new package, grub2-x86_64-efi-bls, which includes a straightforward grubbls.efi file. This file can be copied to the EFI System Partition (ESP) along with boot fragments in the Boot Loader Specification (BLS) format * 0001-Streamline-BLS-and-improve-PCR-stability.patch - Fix crash in bli module (bsc#1226497) * 0001-bli-Fix-crash-in-get_part_uuid.patch - Rework package dependencies: grub2-common now includes common userland utilities and is required by grub2 platform packages. grub2 is now a meta package that pulls in the default platform package. OBS-URL: https://build.opensuse.org/request/show/1196023 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=512
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From e27acddebd30175587155613042abffd2e9a5de8 Mon Sep 17 00:00:00 2001
|
|
From: Mark Salter <msalter@redhat.com>
|
|
Date: Mon, 17 Apr 2017 08:44:29 -0400
|
|
Subject: [PATCH 2/9] 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/efi/linux.c | 16 +++++++++++++++-
|
|
1 file changed, 15 insertions(+), 1 deletion(-)
|
|
|
|
--- a/grub-core/loader/arm64/efi/linux.c
|
|
+++ b/grub-core/loader/arm64/efi/linux.c
|
|
@@ -99,7 +99,21 @@
|
|
|
|
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;
|