From 6527836d2acbfc59350f6d13f4e75bd5fcbb0b0c Mon Sep 17 00:00:00 2001
From: Joseph Chen <chenjh@rock-chips.com>
Date: Tue, 17 Dec 2019 10:47:07 +0800
Subject: [PATCH] common: android: rename and export load_android_image()

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I7398b83bff0fd0dedd77834ee2a8ff14f2ae11e0
---
 common/android_bootloader.c | 15 +++++++++------
 include/image.h             |  3 +++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/common/android_bootloader.c b/common/android_bootloader.c
index aaf3d2866b..74c60769ca 100644
--- a/common/android_bootloader.c
+++ b/common/android_bootloader.c
@@ -1051,9 +1051,9 @@ out:
 }
 #endif
 
-static int load_android_image(struct blk_desc *dev_desc,
-			      char *boot_partname,
-			      unsigned long *load_address)
+int android_image_load_by_partname(struct blk_desc *dev_desc,
+				   const char *boot_partname,
+				   unsigned long *load_address)
 {
 	disk_partition_t boot_part;
 	int ret, part_num;
@@ -1185,8 +1185,9 @@ int android_bootloader_boot_flow(struct blk_desc *dev_desc,
 			printf("Not AVB images, AVB skip\n");
 			env_update("bootargs",
 				   "androidboot.verifiedbootstate=orange");
-			if (load_android_image(dev_desc, boot_partname,
-					       &load_address)) {
+			if (android_image_load_by_partname(dev_desc,
+							   boot_partname,
+							   &load_address)) {
 				printf("Android image load failed\n");
 				return -1;
 			}
@@ -1206,7 +1207,9 @@ int android_bootloader_boot_flow(struct blk_desc *dev_desc,
 	 * 2. Load the boot/recovery from the desired "boot" partition.
 	 * Determine if this is an AOSP image.
 	 */
-	if (load_android_image(dev_desc, boot_partname, &load_address)) {
+	if (android_image_load_by_partname(dev_desc,
+					   boot_partname,
+					   &load_address)) {
 		printf("Android image load failed\n");
 		return -1;
 	}
diff --git a/include/image.h b/include/image.h
index e06c902464..f681c7ef7e 100644
--- a/include/image.h
+++ b/include/image.h
@@ -1300,6 +1300,9 @@ long android_image_load(struct blk_desc *dev_desc,
 			unsigned long load_address,
 			unsigned long max_size);
 
+int android_image_load_by_partname(struct blk_desc *dev_desc,
+				   const char *boot_partname,
+				   unsigned long *load_address);
 #endif /* CONFIG_ANDROID_BOOT_IMAGE */
 
 int bootm_parse_comp(const unsigned char *hdr);