1 files changed, 32 insertions, 7 deletions

diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c
index ed549767a231..3f61f6e2b46f 100644
--- a/arch/x86/boot/tools/build.c
+++ b/arch/x86/boot/tools/build.c
@@ -198,35 +198,60 @@ int main(int argc, char ** argv)
 
         pe_header = get_unaligned_le32(&buf[0x3c]);
 
-        /* Size of code */
-        put_unaligned_le32(file_sz, &buf[pe_header + 0x1c]);
-
         /* Size of image */
         put_unaligned_le32(file_sz, &buf[pe_header + 0x50]);
 
+        /*
+         * Subtract the size of the first section (512 bytes) which
+         * includes the header and .reloc section. The remaining size
+         * is that of the .text section.
+         */
+        file_sz -= 512;
+
+        /* Size of code */
+        put_unaligned_le32(file_sz, &buf[pe_header + 0x1c]);
+
 #ifdef CONFIG_X86_32
-        /* Address of entry point */
-        put_unaligned_le32(i, &buf[pe_header + 0x28]);
+        /*
+         * Address of entry point.
+         *
+         * The EFI stub entry point is +16 bytes from the start of
+         * the .text section.
+         */
+        put_unaligned_le32(i + 16, &buf[pe_header + 0x28]);
 
         /* .text size */
         put_unaligned_le32(file_sz, &buf[pe_header + 0xb0]);
 
+        /* .text vma */
+        put_unaligned_le32(0x200, &buf[pe_header + 0xb4]);
+
         /* .text size of initialised data */
         put_unaligned_le32(file_sz, &buf[pe_header + 0xb8]);
+
+        /* .text file offset */
+        put_unaligned_le32(0x200, &buf[pe_header + 0xbc]);
 #else
         /*
          * Address of entry point. startup_32 is at the beginning and
          * the 64-bit entry point (startup_64) is always 512 bytes
-         * after.
+         * after. The EFI stub entry point is 16 bytes after that, as
+         * the first instruction allows legacy loaders to jump over
+         * the EFI stub initialisation
          */
-        put_unaligned_le32(i + 512, &buf[pe_header + 0x28]);
+        put_unaligned_le32(i + 528, &buf[pe_header + 0x28]);
 
         /* .text size */
         put_unaligned_le32(file_sz, &buf[pe_header + 0xc0]);
 
+        /* .text vma */
+        put_unaligned_le32(0x200, &buf[pe_header + 0xc4]);
+
         /* .text size of initialised data */
         put_unaligned_le32(file_sz, &buf[pe_header + 0xc8]);
 
+        /* .text file offset */
+        put_unaligned_le32(0x200, &buf[pe_header + 0xcc]);
 #endif /* CONFIG_X86_32 */
 #endif /* CONFIG_EFI_STUB */