ENGR00210918-2 cleanup android support, build pass all boards

- move recovery.h to common inlcude place.
- move supported_reco_envs to soc related, not board related,
- user can change this via configure header,
  don't needs this in every board file.
- pass build for all mx5/mx6 android configs.

Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>

7 files changed, 44 insertions, 2 deletions

diff --git a/include/configs/mx50_rd3_android.h b/include/configs/mx50_rd3_android.h
index b0fedc1..7e40e41 100644
--- a/include/configs/mx50_rd3_android.h
+++ b/include/configs/mx50_rd3_android.h
@@ -331,6 +331,8 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 
+#define CONFIG_CMD_BOOTI
+#define CONFIG_ANDROID_BOOT_PARTITION_MMC -1
 #define CONFIG_ANDROID_SYSTEM_PARTITION_MMC 2
 #define CONFIG_ANDROID_RECOVERY_PARTITION_MMC 4
 #define CONFIG_ANDROID_CACHE_PARTITION_MMC 6
diff --git a/include/configs/mx50_rdp_android.h b/include/configs/mx50_rdp_android.h
index 79f5dc7..ab6e578 100644
--- a/include/configs/mx50_rdp_android.h
+++ b/include/configs/mx50_rdp_android.h
@@ -333,6 +333,8 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 
+#define CONFIG_CMD_BOOTI
+#define CONFIG_ANDROID_BOOT_PARTITION_MMC -1
 #define CONFIG_ANDROID_SYSTEM_PARTITION_MMC 2
 #define CONFIG_ANDROID_RECOVERY_PARTITION_MMC 4
 #define CONFIG_ANDROID_CACHE_PARTITION_MMC 6
diff --git a/include/configs/mx50_rdp_mfg.h b/include/configs/mx50_rdp_mfg.h
index 447cb35..fab45ef 100644
--- a/include/configs/mx50_rdp_mfg.h
+++ b/include/configs/mx50_rdp_mfg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
+ * Copyright (C) 2010-2012 Freescale Semiconductor, Inc.
  *
  * Configuration settings for the MX50-RDP Freescale board.
  *
@@ -127,7 +127,6 @@
 		"bootcmd_mmc=run bootargs_base bootargs_mmc; "   \
 		"mmc dev 0; "	\
 		"mmc read ${loadaddr} 0x800 0x1800; bootm\0"   \
-
 		"bootcmd=run bootcmd_net\0"                             \
 
 
diff --git a/include/configs/mx51_bbg_android.h b/include/configs/mx51_bbg_android.h
index 6b46d9d..9a6268c 100644
--- a/include/configs/mx51_bbg_android.h
+++ b/include/configs/mx51_bbg_android.h
@@ -130,6 +130,8 @@
 	"mmc read ${loadaddr} 0x800 0x2000;bootm"
 #define CONFIG_ANDROID_RECOVERY_CMD_FILE "/recovery/command"
 
+#define CONFIG_CMD_BOOTI
+#define CONFIG_ANDROID_BOOT_PARTITION_MMC -1
 #define CONFIG_ANDROID_SYSTEM_PARTITION_MMC 2
 #define CONFIG_ANDROID_RECOVERY_PARTITION_MMC 4
 #define CONFIG_ANDROID_CACHE_PARTITION_MMC 6
diff --git a/include/configs/mx53_evk_android.h b/include/configs/mx53_evk_android.h
index cfff3be..41c8bdc 100644
--- a/include/configs/mx53_evk_android.h
+++ b/include/configs/mx53_evk_android.h
@@ -90,10 +90,13 @@
 #define CONFIG_FASTBOOT_CONFIGURATION_STR  "Android fastboot"
 #define CONFIG_FASTBOOT_INTERFACE_STR    "Android fastboot"
 #define CONFIG_FASTBOOT_SERIAL_NUM      "12345"
+#define CONFIG_FASTBOOT_SATA_NO		 0
 #define CONFIG_FASTBOOT_TRANSFER_BUF    0x80000000
 #define CONFIG_FASTBOOT_TRANSFER_BUF_SIZE 0x9400000 /* 148M byte */
 
+#define CONFIG_CMD_BOOTI
 #define CONFIG_ANDROID_RECOVERY
+#define CONFIG_ANDROID_BOOT_PARTITION_MMC -1
 
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/mx53_smd_android.h b/include/configs/mx53_smd_android.h
index 247917f..a14fa3a 100644
--- a/include/configs/mx53_smd_android.h
+++ b/include/configs/mx53_smd_android.h
@@ -112,6 +112,8 @@
 	"mmc read ${loadaddr} 0x800 0x2000;bootm"
 #define CONFIG_ANDROID_RECOVERY_CMD_FILE "/recovery/command"
 
+#define CONFIG_ANDROID_BOOT_PARTITION_MMC -1
+#define CONFIG_ANDROID_MAIN_MMC_BUS 2
 #define CONFIG_ANDROID_SYSTEM_PARTITION_MMC 2
 #define CONFIG_ANDROID_RECOVERY_PARTITION_MMC 4
 #define CONFIG_ANDROID_CACHE_PARTITION_MMC 6
diff --git a/include/recovery.h b/include/recovery.h
new file mode 100644
index 0000000..5dde01d
--- /dev/null
+++ b/include/recovery.h
@@ -0,0 +1,32 @@
+/*
+ * Android Recovery supported header file
+ *
+ * Copyright (C) 2010-2012 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#ifndef __RECOVERY_H_
+#define __RECOVERY_H_
+
+struct reco_envs {
+	char *cmd;
+	char *args;
+};
+
+int check_and_clean_recovery_flag(void);
+
+#endif