From 0528979fa7ab7853faaf2ecf34b7721dd4c0b383 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Sun, 10 May 2020 11:39:57 -0600
Subject: part: Drop disk_partition_t typedef

We should not be using typedefs and these make it harder to use
forward declarations (to reduce header file inclusions). Drop the typedef.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 common/android_ab.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'common/android_ab.c')

diff --git a/common/android_ab.c b/common/android_ab.c
index e0fe32d24da..b5b8af1b278 100644
--- a/common/android_ab.c
+++ b/common/android_ab.c
@@ -81,7 +81,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;
@@ -131,7 +131,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;
@@ -178,7 +178,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;
-- 
cgit v1.2.3


From e6f6f9e64882ddf242437c73fdd9ff06a8eb7c21 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Sun, 10 May 2020 11:39:58 -0600
Subject: common: Drop part.h from common header

Move this uncommon header out of the common header.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 common/android_ab.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'common/android_ab.c')

diff --git a/common/android_ab.c b/common/android_ab.c
index b5b8af1b278..72025bb552c 100644
--- a/common/android_ab.c
+++ b/common/android_ab.c
@@ -5,9 +5,11 @@
 #include <common.h>
 #include <android_ab.h>
 #include <android_bootloader_message.h>
+#include <blk.h>
 #include <malloc.h>
-#include <linux/err.h>
+#include <part.h>
 #include <memalign.h>
+#include <linux/err.h>
 #include <u-boot/crc.h>
 #include <u-boot/crc.h>
 
-- 
cgit v1.2.3


From f7ae49fc4f363a803dab3be078e93ead8e75a8e9 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Sun, 10 May 2020 11:40:05 -0600
Subject: common: Drop log.h from common header

Move this header out of the common header.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 common/android_ab.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'common/android_ab.c')

diff --git a/common/android_ab.c b/common/android_ab.c
index 72025bb552c..4943f26d53a 100644
--- a/common/android_ab.c
+++ b/common/android_ab.c
@@ -6,6 +6,7 @@
 #include <android_ab.h>
 #include <android_bootloader_message.h>
 #include <blk.h>
+#include <log.h>
 #include <malloc.h>
 #include <part.h>
 #include <memalign.h>
-- 
cgit v1.2.3