image: android: Fix possible build errors
PATCH 1/1 image: android: Fix possible build errors
As android_image.h uses types like u32, we need to include corresponding headers in place. Otherwise the user will be forced to include those in C file, or next build error can occur:
include/android_image.h:32:5: error: unknown type name 'u32'
u32 kernel_size; /* size in bytes */
Include required headers for data types used. While at it, remove typedef struct, which is prohibited by kernel coding style, and fix the comment.
--- include/android_image.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
include/android_image.h +4 -7
@@ -11,18 +11,15 @@#ifndef _ANDROID_IMAGE_H_#define _ANDROID_IMAGE_H_ +#include <linux/compiler.h> +#include <linux/types.h> +#define ANDR_BOOT_MAGIC "ANDROID!"#define ANDR_BOOT_MAGIC_SIZE 8#define ANDR_BOOT_NAME_SIZE 16#define ANDR_BOOT_ARGS_SIZE 512#define ANDR_BOOT_EXTRA_ARGS_SIZE 1024 -/* -* It is expected that callers would explicitly specify which version of the -* boot image header they need to use. -*/ -typedef struct andr_img_hdr andr_img_hdr ; -/* The bootloader expects the structure of andr_img_hdr with header * version 0 to be as follows: */ struct andr_img_hdr {
@@ -115,7 +112,7 @@ struct andr_img_hdr {* +---------------------+ * | dtb | q pages * +---------------------+ - +* * n = (kernel_size + page_size - 1) / page_size * m = (ramdisk_size + page_size - 1) / page_size * o = (second_size + page_size - 1) / page_size
Signature · 1 line
2.20.1
PATCH 1/1 image: android: Fix possible build errors
Quoted 4 lines · Sam Protsenko
As
android_image.huses types like u32, we need to include corresponding headers in place. Otherwise the user will be forced to include those in C file, or next build error can occur:
Quoted 8 lines
include/android_image.h:32:5: error: unknown type name 'u32'
u32kernel_size; /* size in bytes */Include required headers for data types used. While at it, remove typedef struct, which is prohibited by kernel coding style, and fix the comment.
Signed-off-by Sam Protsenko <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191017/37e93c6f/attachment.sig>