diff options
| author | Eugeniu Rosca <erosca@de.adit-jv.com> | 2020-02-17 11:23:53 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-21 12:16:39 -0500 |
| commit | 499758999baa81adf04fcf08d9ab0f371bfa33d2 (patch) | |
| tree | c969a923067d7391afd15eea11d5dc31d7d89352 | |
| parent | 601af58b2388c0d60bab1c0a79fd128087f752e2 (diff) | |
| download | u-boot-WIP/rsa-extend-verify-v7.tar.gz | |
image.h: use uint32_t instead of u32 in android_image_get_dtb*WIP/rsa-extend-verify-v7
Replace 'u32' by 'uint32_t' in image.h, since the former may lead to
build failures in U-Boot tooling (see [1]).
Avoid using 'uint', since it is not a fixed-width type [2], potentially
leading to a dangerous mismatch between the prototypes and definitions
of the android_image_get_dtb* functions.
This should be the quickest way to overcome the tooling build failure,
with more future-proof solutions being proposed by Yamada-san in [1].
[1] https://patchwork.ozlabs.org/patch/1238245/
[2] Excerpt from https://en.cppreference.com/w/cpp/language/types
-----------8<------------
Type specifier Width in bits by data model
LP32 ILP32 LLP64 LP64
unsigned int 16 32 32 32
-----------8<------------
Cc: Tom Rini <trini@konsulko.com>
Cc: Sam Protsenko <joe.skb7@gmail.com>
Fixes: 7f2531502c74c0 ("image: android: Add routine to get dtbo params")
Fixes: c3bfad825a71ea ("image: android: Add functions for handling dtb field")
Suggested-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Sam Protsenko <joe.skb7@gmail.com>
| -rw-r--r-- | include/image.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/image.h b/include/image.h index ceede0d438..2fc7400462 100644 --- a/include/image.h +++ b/include/image.h @@ -1436,9 +1436,9 @@ int android_image_get_ramdisk(const struct andr_img_hdr *hdr, ulong *rd_data, ulong *rd_len); int android_image_get_second(const struct andr_img_hdr *hdr, ulong *second_data, ulong *second_len); -bool android_image_get_dtbo(ulong hdr_addr, ulong *addr, u32 *size); -bool android_image_get_dtb_by_index(ulong hdr_addr, u32 index, ulong *addr, - u32 *size); +bool android_image_get_dtbo(ulong hdr_addr, ulong *addr, uint32_t *size); +bool android_image_get_dtb_by_index(ulong hdr_addr, uint32_t index, ulong *addr, + uint32_t *size); ulong android_image_get_end(const struct andr_img_hdr *hdr); ulong android_image_get_kload(const struct andr_img_hdr *hdr); ulong android_image_get_kcomp(const struct andr_img_hdr *hdr); |