Merge branch x86/build into x86/efi and fix up arch/x86/boot/tools/build.c

Reason for merge:
       The updates to the EFI boot stub generation conflicted with the
       changes to properly use the get/put_unaligned_le*() macros to
       generate images.

       This merge commit completes the conversion in
       arch/x86/boot/tools/build.c including the places in the code
       which had been changed on the x86/efi branch.

Resolved Conflicts:
	arch/x86/boot/tools/build.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --combined arch/x86/boot/tools/build.c
index 2aeab3d,ed54976..4596388
--- 1/arch/x86/boot/tools/build.c
--- 2/arch/x86/boot/tools/build.c
+++ b/arch/x86/boot/tools/build.c
@@@ -29,18 -29,18 +29,18 @@@
  #include <stdarg.h>
  #include <sys/types.h>
  #include <sys/stat.h>
- #include <sys/sysmacros.h>
  #include <unistd.h>
  #include <fcntl.h>
  #include <sys/mman.h>
- #include <asm/boot.h>
+ #include <tools/le_byteshift.h>
  
  typedef unsigned char  u8;
  typedef unsigned short u16;
- typedef unsigned long  u32;
+ typedef unsigned int   u32;
  
  #define DEFAULT_MAJOR_ROOT 0
  #define DEFAULT_MINOR_ROOT 0
+ #define DEFAULT_ROOT_DEV (DEFAULT_MAJOR_ROOT << 8 | DEFAULT_MINOR_ROOT)
  
  /* Minimal number of setup sectors */
  #define SETUP_SECT_MIN 5
@@@ -159,7 -159,7 +159,7 @@@ int main(int argc, char ** argv
                die("read-error on `setup'");
        if (c < 1024)
                die("The setup must be at least 1024 bytes");
-       if (buf[510] != 0x55 || buf[511] != 0xaa)
+       if (get_unaligned_le16(&buf[510]) != 0xAA55)
                die("Boot block hasn't got boot flag (0xAA55)");
        fclose(file);
  
@@@ -171,8 -171,7 +171,7 @@@
        memset(buf+c, 0, i-c);
  
        /* Set the default root device */
-       buf[508] = DEFAULT_MINOR_ROOT;
-       buf[509] = DEFAULT_MAJOR_ROOT;
+       put_unaligned_le16(DEFAULT_ROOT_DEV, &buf[508]);
  
        fprintf(stderr, "Setup is %d bytes (padded to %d bytes).\n", c, i);
  
@@@ -192,63 -191,42 +191,60 @@@
  
        /* Patch the setup code with the appropriate size parameters */
        buf[0x1f1] = setup_sectors-1;
-       buf[0x1f4] = sys_size;
-       buf[0x1f5] = sys_size >> 8;
-       buf[0x1f6] = sys_size >> 16;
-       buf[0x1f7] = sys_size >> 24;
+       put_unaligned_le32(sys_size, &buf[0x1f4]);
  
  #ifdef CONFIG_EFI_STUB
        file_sz = sz + i + ((sys_size * 16) - sz);
  
-       pe_header = *(unsigned int *)&buf[0x3c];
+       pe_header = get_unaligned_le32(&buf[0x3c]);
  
 -      /* Size of code */
 -      put_unaligned_le32(file_sz, &buf[pe_header + 0x1c]);
 -
        /* Size of image */
-       *(unsigned int *)&buf[pe_header + 0x50] = file_sz;
+       put_unaligned_le32(file_sz, &buf[pe_header + 0x50]);
  
-       *(unsigned int *)&buf[pe_header + 0x1c] = file_sz;
 +      /*
 +       * 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 */
-       *(unsigned int *)&buf[pe_header + 0x28] = i;
+       put_unaligned_le32(i, &buf[pe_header + 0x28]);
  
        /* .text size */
-       *(unsigned int *)&buf[pe_header + 0xb0] = file_sz;
+       put_unaligned_le32(file_sz, &buf[pe_header + 0xb0]);
  
-       *(unsigned int *)&buf[pe_header + 0xb4] = 0x200;
 +      /* .text vma */
++      put_unaligned_le32(0x200, &buf[pe_header + 0xb4]);
 +
        /* .text size of initialised data */
-       *(unsigned int *)&buf[pe_header + 0xb8] = file_sz;
+       put_unaligned_le32(file_sz, &buf[pe_header + 0xb8]);
 +
 +      /* .text file offset */
-       *(unsigned int *)&buf[pe_header + 0xbc] = 0x200;
++      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.
         */
-       *(unsigned int *)&buf[pe_header + 0x28] = i + 512;
+       put_unaligned_le32(i + 512, &buf[pe_header + 0x28]);
  
        /* .text size */
-       *(unsigned int *)&buf[pe_header + 0xc0] = file_sz;
+       put_unaligned_le32(file_sz, &buf[pe_header + 0xc0]);
  
-       *(unsigned int *)&buf[pe_header + 0xc4] = 0x200;
 +      /* .text vma */
++      put_unaligned_le32(0x200, &buf[pe_header + 0xc4]);
 +
        /* .text size of initialised data */
-       *(unsigned int *)&buf[pe_header + 0xc8] = file_sz;
+       put_unaligned_le32(file_sz, &buf[pe_header + 0xc8]);
  
-       *(unsigned int *)&buf[pe_header + 0xcc] = 0x200;
 +      /* .text file offset */
++      put_unaligned_le32(0x200, &buf[pe_header + 0xcc]);
  #endif /* CONFIG_X86_32 */
  #endif /* CONFIG_EFI_STUB */
  
@@@ -269,8 -247,9 +265,9 @@@
        }
  
        /* Write the CRC */
-       fprintf(stderr, "CRC %lx\n", crc);
-       if (fwrite(&crc, 1, 4, stdout) != 4)
+       fprintf(stderr, "CRC %x\n", crc);
+       put_unaligned_le32(crc, buf);
+       if (fwrite(buf, 1, 4, stdout) != 4)
                die("Writing CRC failed");
  
        close(fd);