From cf87ffd3512c5769d231e5b0962577a734fb237a Mon Sep 17 00:00:00 2001
From: Jason Zhu <jason.zhu@rock-chips.com>
Date: Tue, 29 Sep 2020 16:40:36 +0800
Subject: [PATCH] include: android_image: move some android common definitions
 to this file

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ia0da707408bcd43b50b49cef89495af7f9d97cd7
---
 common/android_bootloader.c | 22 ----------------------
 include/android_image.h     | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/common/android_bootloader.c b/common/android_bootloader.c
index 41b5682252..2a638e9c7e 100644
--- a/common/android_bootloader.c
+++ b/common/android_bootloader.c
@@ -30,28 +30,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define ANDROID_PARTITION_BOOT "boot"
-#define ANDROID_PARTITION_VENDOR_BOOT "vendor_boot"
-#define ANDROID_PARTITION_MISC "misc"
-#define ANDROID_PARTITION_OEM  "oem"
-#define ANDROID_PARTITION_RECOVERY  "recovery"
-#define ANDROID_PARTITION_SYSTEM "system"
-#define ANDROID_PARTITION_VBMETA "vbmeta"
-#define ANDROID_PARTITION_SUPER "super"
-
-
-#define ANDROID_ARG_SLOT_SUFFIX "androidboot.slot_suffix="
-#define ANDROID_ARG_ROOT "root="
-#define ANDROID_ARG_SERIALNO "androidboot.serialno="
-#define ANDROID_VERIFY_STATE "androidboot.verifiedbootstate="
-#ifdef CONFIG_ROCKCHIP_RESOURCE_IMAGE
-#define ANDROID_ARG_FDT_FILENAME "rk-kernel.dtb"
-#else
-#define ANDROID_ARG_FDT_FILENAME "kernel.dtb"
-#endif
-#define OEM_UNLOCK_ARG_SIZE 30
-#define UUID_SIZE 37
-
 #ifdef CONFIG_ANDROID_AB
 static int is_support_dynamic_partition(struct blk_desc *dev_desc)
 {
diff --git a/include/android_image.h b/include/android_image.h
index bb32dce861..421685372e 100644
--- a/include/android_image.h
+++ b/include/android_image.h
@@ -11,6 +11,27 @@
 #ifndef _ANDROID_IMAGE_H_
 #define _ANDROID_IMAGE_H_
 
+#define ANDROID_PARTITION_BOOT "boot"
+#define ANDROID_PARTITION_VENDOR_BOOT "vendor_boot"
+#define ANDROID_PARTITION_MISC "misc"
+#define ANDROID_PARTITION_OEM  "oem"
+#define ANDROID_PARTITION_RECOVERY  "recovery"
+#define ANDROID_PARTITION_SYSTEM "system"
+#define ANDROID_PARTITION_VBMETA "vbmeta"
+#define ANDROID_PARTITION_SUPER "super"
+
+#define ANDROID_ARG_SLOT_SUFFIX "androidboot.slot_suffix="
+#define ANDROID_ARG_ROOT "root="
+#define ANDROID_ARG_SERIALNO "androidboot.serialno="
+#define ANDROID_VERIFY_STATE "androidboot.verifiedbootstate="
+#ifdef CONFIG_ROCKCHIP_RESOURCE_IMAGE
+#define ANDROID_ARG_FDT_FILENAME "rk-kernel.dtb"
+#else
+#define ANDROID_ARG_FDT_FILENAME "kernel.dtb"
+#endif
+#define OEM_UNLOCK_ARG_SIZE 30
+#define UUID_SIZE 37
+
 #define ANDR_BOOT_MAGIC "ANDROID!"
 #define VENDOR_BOOT_MAGIC "VNDRBOOT"
 #define ANDR_BOOT_MAGIC_SIZE 8