mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

grub2: Enable on riscv32

Browse Source 
Update the patch as submitted upstream to grub2

(From OE-Core rev: a1ce702bb5317712083ae32332051c36923c4a50)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2021-03-28 19:22:09 -07:00
committed by Richard Purdie
parent 9eddd432da
commit eba2ca9aef
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-bsp/grub/files/0001-RISC-V-Restore-the-typcast-to-long.patch
+16 -6
View File
@@ -1,18 +1,28 @@
From bf248231cb4f9f966f0d57821dd0491af54d4a0b Mon Sep 17 00:00:00 2001 From e4c41db74b8972285cbdfe614c95c1ffd97d70e1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com> From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 26 Mar 2021 11:59:43 -0700 Date: Fri, 26 Mar 2021 11:59:43 -0700
Subject: [PATCH] RISC-V: Restore the typcast to long Subject: [PATCH] RISC-V: Restore the typcast to 64bit type
this makes the type promotions clear and explicit this makes the type promotions clear and explicit
It was already typecasted to long but was accidentally dropped in [1]
which stated to cause failures on riscv32 as reported in [2]
Upstream-Status: Pending [1] https://git.savannah.gnu.org/cgit/grub.git/commit/?id=2bf40e9e5be9808b17852e688eead87acff14420
[2] https://savannah.gnu.org/bugs/index.php?60283
Upstream-Status: Submitted
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andreas Schwab <schwab@suse.de>
Cc: Daniel Kiper <daniel.kiper@oracle.com>
Cc: Chester Lin <clin@suse.com>
Cc: Nikita Ermakov <arei@altlinux.org>
Cc: Alistair Francis <alistair.francis@wdc.com>
--- ---
util/grub-mkimagexx.c | 2 +- util/grub-mkimagexx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
index 00f49cc..ab5523d 100644 index 00f49ccaa..ac677d03d 100644
--- a/util/grub-mkimagexx.c --- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c +++ b/util/grub-mkimagexx.c
@@ -1242,7 +1242,7 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, struct section_metadata *smd, @@ -1242,7 +1242,7 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, struct section_metadata *smd,
@@ -20,10 +30,10 @@ index 00f49cc..ab5523d 100644
sym_addr += addend; sym_addr += addend;
- off = sym_addr - target_section_addr - offset - image_target->vaddr_offset; - off = sym_addr - target_section_addr - offset - image_target->vaddr_offset;
+ off = (long)sym_addr - target_section_addr - offset - image_target->vaddr_offset; + off = (grub_int64_t)sym_addr - target_section_addr - offset - image_target->vaddr_offset;
switch (ELF_R_TYPE (info)) switch (ELF_R_TYPE (info))
{ {
-- --
2.31.0 2.31.1
meta/recipes-bsp/grub/grub2.inc
+1 -1
View File
@@ -34,7 +34,7 @@ UPSTREAM_CHECK_REGEX = "grub-(?P<pver>\d+(\.\d+)+)\.tar\.(gz|xz)"
DEPENDS = "flex-native bison-native gettext-native" DEPENDS = "flex-native bison-native gettext-native"
COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|riscv64)-(linux.*|freebsd.*)' COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|riscv.*)-(linux.*|freebsd.*)'
COMPATIBLE_HOST_armv7a = 'null' COMPATIBLE_HOST_armv7a = 'null'
COMPATIBLE_HOST_armv7ve = 'null' COMPATIBLE_HOST_armv7ve = 'null'