mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-26 12:45:20 +03:00
62e5204677
rebase patches and reuse upgrade patches when possible patches 0001-0013 are cherry-picked from upstream
76 lines
3 KiB
Diff
76 lines
3 KiB
Diff
8ad7ef13ce73f7c9a7a452cfd08b69199fdaaa6e RISC-V: Update image header
|
|
include/grub/riscv32/linux.h | 15 ++++++++-------
|
|
include/grub/riscv64/linux.h | 15 ++++++++-------
|
|
2 files changed, 16 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/include/grub/riscv32/linux.h b/include/grub/riscv32/linux.h
|
|
index 512b777c8..de0dbdcd1 100644
|
|
--- a/include/grub/riscv32/linux.h
|
|
+++ b/include/grub/riscv32/linux.h
|
|
@@ -19,20 +19,21 @@
|
|
#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 /* 'RSC\0x5' */
|
|
|
|
-/* From linux/Documentation/riscv/booting.txt */
|
|
+/* From linux/Documentation/riscv/boot-image-header.rst */
|
|
struct linux_riscv_kernel_header
|
|
{
|
|
grub_uint32_t code0; /* Executable code */
|
|
grub_uint32_t code1; /* Executable code */
|
|
- grub_uint64_t text_offset; /* Image load offset */
|
|
- grub_uint64_t res0; /* reserved */
|
|
- grub_uint64_t res1; /* reserved */
|
|
+ grub_uint64_t text_offset; /* Image load offset, little endian */
|
|
+ grub_uint64_t image_size; /* Effective Image size, little endian */
|
|
+ grub_uint64_t flags; /* kernel flags, little endian */
|
|
+ grub_uint32_t version; /* Version of this header */
|
|
+ grub_uint32_t res1; /* reserved */
|
|
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..7c28bc922 100644
|
|
--- a/include/grub/riscv64/linux.h
|
|
+++ b/include/grub/riscv64/linux.h
|
|
@@ -19,22 +19,23 @@
|
|
#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 /* 'RSC\0x5' */
|
|
|
|
#define GRUB_EFI_PE_MAGIC 0x5A4D
|
|
|
|
-/* From linux/Documentation/riscv/booting.txt */
|
|
+/* From linux/Documentation/riscv/boot-image-header.rst */
|
|
struct linux_riscv_kernel_header
|
|
{
|
|
grub_uint32_t code0; /* Executable code */
|
|
grub_uint32_t code1; /* Executable code */
|
|
- grub_uint64_t text_offset; /* Image load offset */
|
|
- grub_uint64_t res0; /* reserved */
|
|
- grub_uint64_t res1; /* reserved */
|
|
+ grub_uint64_t text_offset; /* Image load offset, little endian */
|
|
+ grub_uint64_t image_size; /* Effective Image size, little endian */
|
|
+ grub_uint64_t flags; /* kernel flags, little endian */
|
|
+ grub_uint32_t version; /* Version of this header */
|
|
+ grub_uint32_t res1; /* reserved */
|
|
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.39.2
|
|
|