diff options
| author | Tom Rini <[email protected]> | 2019-10-16 18:10:01 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-10-16 18:10:01 -0400 |
| commit | d2a93a88631929169d3ef1c537430330404f96f7 (patch) | |
| tree | 3bb988631763c4fc0d373885caa900063d1fc85c /include/android_image.h | |
| parent | 6891152a4596d38ac25d2fe1238e3b6a938554b8 (diff) | |
| parent | 568356d8d609bd57b8cc4c7c3d2c0e74b1624e32 (diff) | |
Merge branch '2019-10-15-master-imports'
- Split travis jobs again so we don't have failures due to excessive
build times.
- Android image updates
- cscope bugfix, update ARM maintainers entry, drop H2200 platform.
Diffstat (limited to 'include/android_image.h')
| -rw-r--r-- | include/android_image.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/android_image.h b/include/android_image.h index 0519ece368d..54d25af0684 100644 --- a/include/android_image.h +++ b/include/android_image.h @@ -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 |