The image header for riscv in the kernel was modified to improve compatibility with the ARM64 header.
Signed-off-by: Nikita Ermakov <a...@altlinux.org> --- include/grub/riscv32/linux.h | 4 ++-- include/grub/riscv64/linux.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/grub/riscv32/linux.h b/include/grub/riscv32/linux.h index 512b777c8..5718bf569 100644 --- a/include/grub/riscv32/linux.h +++ b/include/grub/riscv32/linux.h @@ -19,7 +19,7 @@ #ifndef GRUB_RISCV32_LINUX_HEADER #define GRUB_RISCV32_LINUX_HEADER 1 -#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x52534356 /* 'RSCV' */ +#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x05435352 /* little endian, 'RSC\x05' */ /* From linux/Documentation/riscv/booting.txt */ struct linux_riscv_kernel_header @@ -32,7 +32,7 @@ struct linux_riscv_kernel_header grub_uint64_t res2; /* reserved */ grub_uint64_t res3; /* reserved */ grub_uint64_t res4; /* reserved */ - grub_uint32_t magic; /* Magic number, little endian, "RSCV" */ + grub_uint32_t magic; /* Magic number, little endian, "RSC\x05" */ grub_uint32_t hdr_offset; /* Offset of PE/COFF header */ }; diff --git a/include/grub/riscv64/linux.h b/include/grub/riscv64/linux.h index 3630c30fb..a57fa0c81 100644 --- a/include/grub/riscv64/linux.h +++ b/include/grub/riscv64/linux.h @@ -19,7 +19,7 @@ #ifndef GRUB_RISCV64_LINUX_HEADER #define GRUB_RISCV64_LINUX_HEADER 1 -#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x52534356 /* 'RSCV' */ +#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x05435352 /* little endian, 'RSC\x05' */ #define GRUB_EFI_PE_MAGIC 0x5A4D @@ -34,7 +34,7 @@ struct linux_riscv_kernel_header grub_uint64_t res2; /* reserved */ grub_uint64_t res3; /* reserved */ grub_uint64_t res4; /* reserved */ - grub_uint32_t magic; /* Magic number, little endian, "RSCV" */ + grub_uint32_t magic; /* Magic number, little endian, "RSC\x05" */ grub_uint32_t hdr_offset; /* Offset of PE/COFF header */ }; -- 2.25.4 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
