Skip to content
Commit a9aff3ea authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

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: default avatarH. Peter Anvin <hpa@linux.intel.com>
parents e47bb0bd a51f4047
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment