[v6 PATCH 2/3] RISC-V: Update image header

[Atish Patra]

Update the RISC-V Linux kernel image headers as per the current header.

Reference:
<Linux kernel source>/Documentation/riscv/boot-image-header.rst

474efecb65dc: ("riscv: modify the Image header to improve compatibility with 
the ARM64 header")

Acked-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Signed-off-by: Atish Patra <atishp@rivosinc.com>
---
 include/grub/riscv32/linux.h | 19 ++++++++++---------
 include/grub/riscv64/linux.h | 19 +++++++++++--------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/include/grub/riscv32/linux.h b/include/grub/riscv32/linux.h
index 512b777c8a41..a884d4f4760c 100644
--- a/include/grub/riscv32/linux.h
+++ b/include/grub/riscv32/linux.h
@@ -19,21 +19,22 @@
 #ifndef GRUB_RISCV32_LINUX_HEADER
 #define GRUB_RISCV32_LINUX_HEADER 1
 
-#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x52534356 /* 'RSCV' */
-
-/* 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_uint64_t magic;         /* magic (RISC-V specifc, deprecated)*/
+  grub_uint32_t magic2;                /* Magic number 2 (to match the ARM64 
'magic' field pos) */
   grub_uint32_t hdr_offset;    /* Offset of PE/COFF header */
+
+  struct grub_pe_image_header pe_image_header;
 };
 
 #define linux_arch_kernel_header linux_riscv_kernel_header
diff --git a/include/grub/riscv64/linux.h b/include/grub/riscv64/linux.h
index 3630c30fbf1a..a69046de34ef 100644
--- a/include/grub/riscv64/linux.h
+++ b/include/grub/riscv64/linux.h
@@ -19,23 +19,26 @@
 #ifndef GRUB_RISCV64_LINUX_HEADER
 #define GRUB_RISCV64_LINUX_HEADER 1
 
-#define GRUB_LINUX_RISCV_MAGIC_SIGNATURE 0x52534356 /* 'RSCV' */
+#include <grub/efi/pe32.h>
 
 #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_uint64_t magic;         /* magic (RISC-V specifc, deprecated)*/
+  grub_uint32_t magic2;                /* Magic number 2 (to match the ARM64 
'magic' field pos) */
   grub_uint32_t hdr_offset;    /* Offset of PE/COFF header */
+
+  struct grub_pe_image_header pe_image_header;
 };
 
 #define linux_arch_kernel_header linux_riscv_kernel_header
-- 
2.25.1