-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch x86/build into x86/efi and fix up arch/x86/boot/tools/bu…
…ild.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>- Loading branch information
Showing
9 changed files
with
172 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| #ifndef _TOOLS_BE_BYTESHIFT_H | ||
| #define _TOOLS_BE_BYTESHIFT_H | ||
|
|
||
| #include <linux/types.h> | ||
|
|
||
| static inline __u16 __get_unaligned_be16(const __u8 *p) | ||
| { | ||
| return p[0] << 8 | p[1]; | ||
| } | ||
|
|
||
| static inline __u32 __get_unaligned_be32(const __u8 *p) | ||
| { | ||
| return p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3]; | ||
| } | ||
|
|
||
| static inline __u64 __get_unaligned_be64(const __u8 *p) | ||
| { | ||
| return (__u64)__get_unaligned_be32(p) << 32 | | ||
| __get_unaligned_be32(p + 4); | ||
| } | ||
|
|
||
| static inline void __put_unaligned_be16(__u16 val, __u8 *p) | ||
| { | ||
| *p++ = val >> 8; | ||
| *p++ = val; | ||
| } | ||
|
|
||
| static inline void __put_unaligned_be32(__u32 val, __u8 *p) | ||
| { | ||
| __put_unaligned_be16(val >> 16, p); | ||
| __put_unaligned_be16(val, p + 2); | ||
| } | ||
|
|
||
| static inline void __put_unaligned_be64(__u64 val, __u8 *p) | ||
| { | ||
| __put_unaligned_be32(val >> 32, p); | ||
| __put_unaligned_be32(val, p + 4); | ||
| } | ||
|
|
||
| static inline __u16 get_unaligned_be16(const void *p) | ||
| { | ||
| return __get_unaligned_be16((const __u8 *)p); | ||
| } | ||
|
|
||
| static inline __u32 get_unaligned_be32(const void *p) | ||
| { | ||
| return __get_unaligned_be32((const __u8 *)p); | ||
| } | ||
|
|
||
| static inline __u64 get_unaligned_be64(const void *p) | ||
| { | ||
| return __get_unaligned_be64((const __u8 *)p); | ||
| } | ||
|
|
||
| static inline void put_unaligned_be16(__u16 val, void *p) | ||
| { | ||
| __put_unaligned_be16(val, p); | ||
| } | ||
|
|
||
| static inline void put_unaligned_be32(__u32 val, void *p) | ||
| { | ||
| __put_unaligned_be32(val, p); | ||
| } | ||
|
|
||
| static inline void put_unaligned_be64(__u64 val, void *p) | ||
| { | ||
| __put_unaligned_be64(val, p); | ||
| } | ||
|
|
||
| #endif /* _TOOLS_BE_BYTESHIFT_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| #ifndef _TOOLS_LE_BYTESHIFT_H | ||
| #define _TOOLS_LE_BYTESHIFT_H | ||
|
|
||
| #include <linux/types.h> | ||
|
|
||
| static inline __u16 __get_unaligned_le16(const __u8 *p) | ||
| { | ||
| return p[0] | p[1] << 8; | ||
| } | ||
|
|
||
| static inline __u32 __get_unaligned_le32(const __u8 *p) | ||
| { | ||
| return p[0] | p[1] << 8 | p[2] << 16 | p[3] << 24; | ||
| } | ||
|
|
||
| static inline __u64 __get_unaligned_le64(const __u8 *p) | ||
| { | ||
| return (__u64)__get_unaligned_le32(p + 4) << 32 | | ||
| __get_unaligned_le32(p); | ||
| } | ||
|
|
||
| static inline void __put_unaligned_le16(__u16 val, __u8 *p) | ||
| { | ||
| *p++ = val; | ||
| *p++ = val >> 8; | ||
| } | ||
|
|
||
| static inline void __put_unaligned_le32(__u32 val, __u8 *p) | ||
| { | ||
| __put_unaligned_le16(val >> 16, p + 2); | ||
| __put_unaligned_le16(val, p); | ||
| } | ||
|
|
||
| static inline void __put_unaligned_le64(__u64 val, __u8 *p) | ||
| { | ||
| __put_unaligned_le32(val >> 32, p + 4); | ||
| __put_unaligned_le32(val, p); | ||
| } | ||
|
|
||
| static inline __u16 get_unaligned_le16(const void *p) | ||
| { | ||
| return __get_unaligned_le16((const __u8 *)p); | ||
| } | ||
|
|
||
| static inline __u32 get_unaligned_le32(const void *p) | ||
| { | ||
| return __get_unaligned_le32((const __u8 *)p); | ||
| } | ||
|
|
||
| static inline __u64 get_unaligned_le64(const void *p) | ||
| { | ||
| return __get_unaligned_le64((const __u8 *)p); | ||
| } | ||
|
|
||
| static inline void put_unaligned_le16(__u16 val, void *p) | ||
| { | ||
| __put_unaligned_le16(val, p); | ||
| } | ||
|
|
||
| static inline void put_unaligned_le32(__u32 val, void *p) | ||
| { | ||
| __put_unaligned_le32(val, p); | ||
| } | ||
|
|
||
| static inline void put_unaligned_le64(__u64 val, void *p) | ||
| { | ||
| __put_unaligned_le64(val, p); | ||
| } | ||
|
|
||
| #endif /* _TOOLS_LE_BYTESHIFT_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters