summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/configs/mx6sabreandroid_common.h16
-rw-r--r--include/configs/mx6sxsabreautoandroid.h15
-rw-r--r--include/configs/mx6sxsabresdandroid.h15
-rw-r--r--include/configs/mx6ul_14x14_evk_android.h21
-rw-r--r--include/configs/mx6ul_14x14_evk_brillo.h7
-rw-r--r--include/configs/mx7dsabresdandroid.h28
-rw-r--r--include/configs/mx7dsabresdbrillo.h6
-rw-r--r--include/fsl_fastboot.h25
8 files changed, 75 insertions, 58 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
diff --git a/include/fsl_fastboot.h b/include/fsl_fastboot.h
index 1abfe9a..256bb36 100644
--- a/include/fsl_fastboot.h
+++ b/include/fsl_fastboot.h
@@ -33,27 +33,28 @@
#define FASTBOOT_MMC_USER_PARTITION_ID 0
#define FASTBOOT_MMC_NONE_PARTITION_ID -1
+#ifdef CONFIG_FASTBOOT_LOCK
+#define FASTBOOT_PARTITION_FBMISC "fbmisc"
+#define FASTBOOT_PARTITION_PRDATA "prdata"
+#define FASTBOOT_PARTITION_FBMISC_FS "emmc"
+#define FASTBOOT_PARTITION_PRDATA_FS "emmc"
+#endif
+
+#define FASTBOOT_PARTITION_BOOTLOADER "bootloader"
+#define FASTBOOT_PARTITION_MISC "misc"
+
#ifdef CONFIG_BRILLO_SUPPORT
#define FASTBOOT_PARTITION_BOOT_A "boot_a"
#define FASTBOOT_PARTITION_SYSTEM_A "system_a"
-#define FASTBOOT_PARTITION_BOOTLOADER "bootloader"
#define FASTBOOT_PARTITION_DATA "userdata"
#define FASTBOOT_PARTITION_BOOT_B "boot_b"
#define FASTBOOT_PARTITION_SYSTEM_B "system_b"
-#define FASTBOOT_PARTITION_MISC "misc"
-
-#define FASTBOOT_PARTITION_BOOT_FS "emmc"
-#define FASTBOOT_PARTITION_SYSTEM_FS "ext4"
-#define FASTBOOT_PARTITION_BOOTLOADER_FS "emmc"
-#define FASTBOOT_PARTITION_DATA_FS "ext4"
-#define FASTBOOT_PARTITION_MISC_FS "emmc"
-
-#else
+#else /* CONFIG_BRILLO_SUPPORT */
#define FASTBOOT_PARTITION_BOOT "boot"
#define FASTBOOT_PARTITION_RECOVERY "recovery"
#define FASTBOOT_PARTITION_SYSTEM "system"
-#define FASTBOOT_PARTITION_BOOTLOADER "bootloader"
#define FASTBOOT_PARTITION_DATA "data"
+#endif /* CONFIG_BRILLO_SUPPORT */
#define FASTBOOT_PARTITION_BOOT_FS "emmc"
#define FASTBOOT_PARTITION_RECOVERY_FS "emmc"
@@ -62,8 +63,6 @@
#define FASTBOOT_PARTITION_DATA_FS "ext4"
#define FASTBOOT_PARTITION_MISC_FS "emmc"
-#endif
-
enum {
DEV_SATA,
DEV_MMC,
generated by cgit v1.1 at 2024-12-12 02:00:41 +0000