7 files changed, 63 insertions, 45 deletions
diff --git a/include/configs/mx6sabreandroid_common.h b/include/configs/mx6sabreandroid_common.h
index 2b22782..15396cf 100644
--- a/include/configs/mx6sabreandroid_common.h
+++ b/include/configs/mx6sabreandroid_common.h
@@ -32,11 +32,6 @@
 #define CONFIG_FASTBOOT_LOCK
 #endif
 
-#define FSL_FASTBOOT_FB_DEV "mmc"
-#define FSL_FASTBOOT_DATA_PART_NUM 4
-#define FSL_FASTBOOT_FB_PART_NUM 11
-#define FSL_FASTBOOT_PR_DATA_PART_NUM 12
-
 #define CONFIG_FSL_CAAM_KB
 #define CONFIG_CMD_FSL_CAAM_KB
 #define CONFIG_SHA1
@@ -54,12 +49,23 @@
 #endif
 
 #define CONFIG_ANDROID_MAIN_MMC_BUS 2
+
+#ifndef CONFIG_EFI_PARTITION
 #define CONFIG_ANDROID_BOOT_PARTITION_MMC 1
 #define CONFIG_ANDROID_SYSTEM_PARTITION_MMC 5
 #define CONFIG_ANDROID_RECOVERY_PARTITION_MMC 2
 #define CONFIG_ANDROID_CACHE_PARTITION_MMC 6
 #define CONFIG_ANDROID_DATA_PARTITION_MMC 4
 #define CONFIG_ANDROID_MISC_PARTITION_MMC 8
+#endif
+
+#ifdef CONFIG_FASTBOOT_LOCK
+#define FSL_FASTBOOT_FB_DEV "mmc"
+#ifndef CONFIG_EFI_PARTITION
+#define CONFIG_ANDROID_FBMISC_PARTITION_MMC 11
+#define CONFIG_ANDROID_PRDATA_PARTITION_MMC 12
+#endif
+#endif /* CONFIG_FASTBOOT_LOCK */
 
 #if defined(CONFIG_FASTBOOT_STORAGE_NAND)
 #define ANDROID_FASTBOOT_NAND_PARTS "16m@64m(boot) 16m@80m(recovery) 810m@96m(android_root)ubifs"
diff --git a/include/configs/mx6sxsabreautoandroid.h b/include/configs/mx6sxsabreautoandroid.h
index b15b924..6da598f 100644
--- a/include/configs/mx6sxsabreautoandroid.h
+++ b/include/configs/mx6sxsabreautoandroid.h
@@ -33,10 +33,6 @@
 #define CONFIG_FASTBOOT_LOCK
 #endif
 
-#define FSL_FASTBOOT_FB_DEV "mmc"
-#define FSL_FASTBOOT_DATA_PART_NUM 4
-#define FSL_FASTBOOT_FB_PART_NUM 11
-#define FSL_FASTBOOT_PR_DATA_PART_NUM 12
 
 #define CONFIG_FSL_CAAM_KB
 #define CONFIG_CMD_FSL_CAAM_KB
@@ -57,12 +53,23 @@
 #endif
 
 #define CONFIG_ANDROID_MAIN_MMC_BUS 2
+
+#ifndef CONFIG_EFI_PARTITION
 #define CONFIG_ANDROID_BOOT_PARTITION_MMC 1
 #define CONFIG_ANDROID_SYSTEM_PARTITION_MMC 5
 #define CONFIG_ANDROID_RECOVERY_PARTITION_MMC 2
 #define CONFIG_ANDROID_CACHE_PARTITION_MMC 6
 #define CONFIG_ANDROID_DATA_PARTITION_MMC 4
 #define CONFIG_ANDROID_MISC_PARTITION_MMC 8
+#endif
+
+#ifdef CONFIG_FASTBOOT_LOCK
+#define FSL_FASTBOOT_FB_DEV "mmc"
+#ifndef CONFIG_EFI_PARTITION
+#define CONFIG_ANDROID_FBMISC_PARTITION_MMC 11
+#define CONFIG_ANDROID_PRDATA_PARTITION_MMC 12
+#endif
+#endif /* CONFIG_FASTBOOT_LOCK */
 
 #define CONFIG_CMD_BOOTA
 #define CONFIG_SUPPORT_RAW_INITRD
diff --git a/include/configs/mx6sxsabresdandroid.h b/include/configs/mx6sxsabresdandroid.h
index 22c7892..0391714 100644
--- a/include/configs/mx6sxsabresdandroid.h
+++ b/include/configs/mx6sxsabresdandroid.h
@@ -33,10 +33,6 @@
 #define CONFIG_FASTBOOT_LOCK
 #endif
 
-#define FSL_FASTBOOT_FB_DEV "mmc"
-#define FSL_FASTBOOT_DATA_PART_NUM 4
-#define FSL_FASTBOOT_FB_PART_NUM 11
-#define FSL_FASTBOOT_PR_DATA_PART_NUM 12
 
 #define CONFIG_FSL_CAAM_KB
 #define CONFIG_CMD_FSL_CAAM_KB
@@ -49,12 +45,23 @@
 #define CONFIG_FASTBOOT_STORAGE_MMC
 
 #define CONFIG_ANDROID_MAIN_MMC_BUS 2
+
+#ifndef CONFIG_EFI_PARTITION
 #define CONFIG_ANDROID_BOOT_PARTITION_MMC 1
 #define CONFIG_ANDROID_SYSTEM_PARTITION_MMC 5
 #define CONFIG_ANDROID_RECOVERY_PARTITION_MMC 2
 #define CONFIG_ANDROID_CACHE_PARTITION_MMC 6
 #define CONFIG_ANDROID_DATA_PARTITION_MMC 4
 #define CONFIG_ANDROID_MISC_PARTITION_MMC 8
+#endif
+
+#ifdef CONFIG_FASTBOOT_LOCK
+#define FSL_FASTBOOT_FB_DEV "mmc"
+#ifndef CONFIG_EFI_PARTITION
+#define CONFIG_ANDROID_FBMISC_PARTITION_MMC 11
+#define CONFIG_ANDROID_PRDATA_PARTITION_MMC 12
+#endif
+#endif /* CONFIG_FASTBOOT_LOCK */
 
 #define CONFIG_CMD_BOOTA
 #define CONFIG_SUPPORT_RAW_INITRD
diff --git a/include/configs/mx6ul_14x14_evk_android.h b/include/configs/mx6ul_14x14_evk_android.h
index 1565597..2c95d48 100644
--- a/include/configs/mx6ul_14x14_evk_android.h
+++ b/include/configs/mx6ul_14x14_evk_android.h
@@ -42,35 +42,28 @@
 
 #define CONFIG_ANDROID_MAIN_MMC_BUS 2
 
-
 #ifdef CONFIG_BRILLO_SUPPORT
 
-#ifdef CONFIG_EFI_PARTITION
-#define CONFIG_ANDROID_BOOT_PARTITION_MMC 1
-#define CONFIG_ANDROID_BOOT_B_PARTITION_MMC 2
-#define CONFIG_ANDROID_SYSTEM_PARTITION_MMC 3
-#define CONFIG_ANDROID_SYSTEM_B_PARTITION_MMC 4
-#define CONFIG_ANDROID_MISC_PARTITION_MMC 7
-#define CONFIG_ANDROID_DATA_PARTITION_MMC 8
-#define FSL_FASTBOOT_FB_PART_NUM 9
-#else
+#ifndef CONFIG_EFI_PARTITION
 #define CONFIG_ANDROID_BOOT_PARTITION_MMC 1
 #define CONFIG_ANDROID_BOOT_B_PARTITION_MMC 7
 #define CONFIG_ANDROID_SYSTEM_PARTITION_MMC 5
 #define CONFIG_ANDROID_SYSTEM_B_PARTITION_MMC 8
 #define CONFIG_ANDROID_MISC_PARTITION_MMC 9
 #define CONFIG_ANDROID_DATA_PARTITION_MMC 4
-#define FSL_FASTBOOT_FB_PART_NUM 10
-#endif
+#endif /* CONFIG_EFI_PARTITION */
 
-#else
+#else /* CONFIG_BRILLO_SUPPORT */
 
+#ifndef CONFIG_EFI_PARTITION
 #define CONFIG_ANDROID_BOOT_PARTITION_MMC 1
 #define CONFIG_ANDROID_SYSTEM_PARTITION_MMC 5
 #define CONFIG_ANDROID_RECOVERY_PARTITION_MMC 2
 #define CONFIG_ANDROID_CACHE_PARTITION_MMC 6
 #define CONFIG_ANDROID_DATA_PARTITION_MMC 4
-#endif
+#endif /* CONFIG_EFI_PARTITION */
+
+#endif /* CONFIG_BRILLO_SUPPORT */
 
 #define CONFIG_CMD_BOOTA
 #define CONFIG_SUPPORT_RAW_INITRD
diff --git a/include/configs/mx6ul_14x14_evk_brillo.h b/include/configs/mx6ul_14x14_evk_brillo.h
index d0d824c..5ad0c799 100644
--- a/include/configs/mx6ul_14x14_evk_brillo.h
+++ b/include/configs/mx6ul_14x14_evk_brillo.h
@@ -13,9 +13,12 @@
 #define CONFIG_DOS_PARTITION
 
 #define CONFIG_FASTBOOT_LOCK
-
+#ifdef CONFIG_FASTBOOT_LOCK
 #define FSL_FASTBOOT_FB_DEV "mmc"
-#define FSL_FASTBOOT_DATA_PART_NUM CONFIG_ANDROID_DATA_PARTITION_MMC
+#ifndef CONFIG_EFI_PARTITION
+#define CONFIG_ANDROID_FBMISC_PARTITION_MMC 10
+#endif
+#endif
 
 #define CONFIG_FSL_CAAM_KB
 #define CONFIG_SHA1
diff --git a/include/configs/mx7dsabresdandroid.h b/include/configs/mx7dsabresdandroid.h
index 6dd951b..9d90d1e 100644
--- a/include/configs/mx7dsabresdandroid.h
+++ b/include/configs/mx7dsabresdandroid.h
@@ -34,36 +34,34 @@
 
 #define CONFIG_ANDROID_MAIN_MMC_BUS 2
 
-
 #ifdef CONFIG_BRILLO_SUPPORT
 
-#ifdef CONFIG_EFI_PARTITION
-#define CONFIG_ANDROID_BOOT_PARTITION_MMC 1
-#define CONFIG_ANDROID_BOOT_B_PARTITION_MMC 2
-#define CONFIG_ANDROID_SYSTEM_PARTITION_MMC 3
-#define CONFIG_ANDROID_SYSTEM_B_PARTITION_MMC 4
-#define CONFIG_ANDROID_MISC_PARTITION_MMC 7
-#define CONFIG_ANDROID_DATA_PARTITION_MMC 8
-#define FSL_FASTBOOT_FB_PART_NUM 9
-
-#else
+#ifndef CONFIG_EFI_PARTITION
 #define CONFIG_ANDROID_BOOT_PARTITION_MMC 1
 #define CONFIG_ANDROID_BOOT_B_PARTITION_MMC 7
 #define CONFIG_ANDROID_SYSTEM_PARTITION_MMC 5
 #define CONFIG_ANDROID_SYSTEM_B_PARTITION_MMC 8
 #define CONFIG_ANDROID_MISC_PARTITION_MMC 9
 #define CONFIG_ANDROID_DATA_PARTITION_MMC 4
-#define FSL_FASTBOOT_FB_PART_NUM 10
-#endif
+#ifdef CONFIG_AVB_SUPPORT
+#define CONFIG_ANDROID_VBMETA_A_PARTITION_MMC 11
+#define CONFIG_ANDROID_VBMETA_B_PARTITION_MMC 12
+#define CONFIG_ANDROID_AVBKEY_PARTITION_MMC 13
+#endif /* CONFIG_AVB_SUPPORT */
+#endif /* CONFIG_EFI_PARTITION */
 
-#else
+#else /* CONFIG_BRILLO_SUPPORT */
+
+#ifndef CONFIG_EFI_PARTITION
 #define CONFIG_ANDROID_BOOT_PARTITION_MMC 1
 #define CONFIG_ANDROID_SYSTEM_PARTITION_MMC 5
 #define CONFIG_ANDROID_RECOVERY_PARTITION_MMC 2
 #define CONFIG_ANDROID_CACHE_PARTITION_MMC 6
 #define CONFIG_ANDROID_DATA_PARTITION_MMC 4
 #define CONFIG_ANDROID_MISC_PARTITION_MMC 8
-#endif
+#endif /* CONFIG_EFI_PARTITION */
+
+#endif /* CONFIG_BRILLO_SUPPORT */
 
 
 #define CONFIG_CMD_BOOTA
diff --git a/include/configs/mx7dsabresdbrillo.h b/include/configs/mx7dsabresdbrillo.h
index 3313018..9ebb05f 100644
--- a/include/configs/mx7dsabresdbrillo.h
+++ b/include/configs/mx7dsabresdbrillo.h
@@ -13,8 +13,12 @@
 
 #define CONFIG_FASTBOOT_LOCK
 
+#ifdef CONFIG_FASTBOOT_LOCK
 #define FSL_FASTBOOT_FB_DEV "mmc"
-#define FSL_FASTBOOT_DATA_PART_NUM CONFIG_ANDROID_DATA_PARTITION_MMC
+#ifndef CONFIG_EFI_PARTITION
+#define CONFIG_ANDROID_FBMISC_PARTITION_MMC 10
+#endif
+#endif
 
 #define CONFIG_SHA1
 #define CONFIG_SHA256