efi_loader: validate load option

[oweals/u-boot.git] / common / android_ab.c

diff --git a/common/android_ab.c b/common/android_ab.c
index 6c4df419b29ac45e3db4b6ace36abb838c3d3e38..4943f26d53ab3e615fe228b7d386e46c1a49bf40 100644 (file)
--- a/common/android_ab.c
+++ b/common/android_ab.c
@@ -5,8 +5,12 @@
 #include <common.h>
 #include <android_ab.h>
 #include <android_bootloader_message.h>
-#include <linux/err.h>
+#include <blk.h>
+#include <log.h>
+#include <malloc.h>
+#include <part.h>
 #include <memalign.h>
+#include <linux/err.h>
 #include <u-boot/crc.h>
 #include <u-boot/crc.h>
 
@@ -80,7 +84,7 @@ static int ab_control_default(struct bootloader_control *abc)
  * @return 0 on success and a negative on error
  */
 static int ab_control_create_from_disk(struct blk_desc *dev_desc,
-                                      const disk_partition_t *part_info,
+                                      const struct disk_partition *part_info,
                                       struct bootloader_control **abc)
 {
        ulong abc_offset, abc_blocks, ret;
@@ -130,7 +134,7 @@ static int ab_control_create_from_disk(struct blk_desc *dev_desc,
  * @return 0 on success and a negative on error
  */
 static int ab_control_store(struct blk_desc *dev_desc,
-                           const disk_partition_t *part_info,
+                           const struct disk_partition *part_info,
                            struct bootloader_control *abc)
 {
        ulong abc_offset, abc_blocks, ret;
@@ -177,7 +181,7 @@ static int ab_compare_slots(const struct slot_metadata *a,
        return 0;
 }
 
-int ab_select_slot(struct blk_desc *dev_desc, disk_partition_t *part_info)
+int ab_select_slot(struct blk_desc *dev_desc, struct disk_partition *part_info)
 {
        struct bootloader_control *abc = NULL;
        u32 crc32_le;