diff options
| author | zhang sanshan <sanshan.zhang@nxp.com> | 2017-05-18 21:43:46 +0800 |
|---|---|---|
| committer | Zhang Bo <bo.zhang@nxp.com> | 2017-06-21 12:21:04 +0800 |
| commit | e095bd4e264aa171bb7e91196ac82a989e7b9649 (patch) | |
| tree | ec1d87ad16e4f6377bad5c86a314ad9345d05e54 | |
| parent | 61d4dcbd1862a4a77a527df3fd8853787cfe0c0c (diff) | |
| download | u-boot-imx-e095bd4e264aa171bb7e91196ac82a989e7b9649.zip u-boot-imx-e095bd4e264aa171bb7e91196ac82a989e7b9649.tar.gz u-boot-imx-e095bd4e264aa171bb7e91196ac82a989e7b9649.tar.bz2 | |
MA-9382 [Android] uboot: enable BCB&BOOTCTR&LOCK_UNLOCK
Add configure for bcb & bootctr & lock_unlock for android.
change CONFIG_SYS_BOOT_NAND to CONFIG_NAND_BOOT
correct macro ANDROID_FASTBOOT_NAND_PARTS.
Change-Id: Iec2190ee940260d770de904889d8d352572a80b5
Signed-off-by: zhang sanshan <sanshan.zhang@nxp.com>
| -rw-r--r-- | include/configs/mx6sabreandroid_common.h | 17 | ||||
| -rw-r--r-- | include/configs/mx6slevkandroid.h | 3 | ||||
| -rw-r--r-- | include/configs/mx6sxsabreautoandroid.h | 17 | ||||
| -rw-r--r-- | include/configs/mx6sxsabresdandroid.h | 13 | ||||
| -rw-r--r-- | include/configs/mx6ul_14x14_evk_android.h | 2 | ||||
| -rw-r--r-- | include/configs/mx7dsabresdandroid.h | 3 |
6 files changed, 50 insertions, 5 deletions
diff --git a/include/configs/mx6sabreandroid_common.h b/include/configs/mx6sabreandroid_common.h index 3922f67..2f35bd9 100644 --- a/include/configs/mx6sabreandroid_common.h +++ b/include/configs/mx6sabreandroid_common.h @@ -11,6 +11,19 @@ #define CONFIG_USBD_HS #define CONFIG_USB_GADGET_DUALSPEED + +#define CONFIG_BCB_SUPPORT +#define CONFIG_CMD_READ +/* For NAND we don't support lock/unlock */ +#ifndef CONFIG_NAND_BOOT +#define CONFIG_FASTBOOT_LOCK +#define FSL_FASTBOOT_FB_DEV "mmc" +#define FASTBOOT_ENCRYPT_LOCK +#define CONFIG_FSL_CAAM_KB +#define CONFIG_CMD_FSL_CAAM_KB +#define CONFIG_SHA1 +#define CONFIG_SHA256 +#endif #define CONFIG_USB_GADGET #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE @@ -29,7 +42,7 @@ #define CONFIG_FSL_FASTBOOT #define CONFIG_ANDROID_RECOVERY -#if defined CONFIG_SYS_BOOT_NAND +#if defined CONFIG_NAND_BOOT #define CONFIG_FASTBOOT_STORAGE_NAND #elif defined CONFIG_SYS_BOOT_SATA #define CONFIG_FASTBOOT_STORAGE_SATA @@ -39,7 +52,7 @@ #endif #if defined(CONFIG_FASTBOOT_STORAGE_NAND) -#define ANDROID_FASTBOOT_NAND_PARTS "16m@64m(boot) 16m@80m(recovery) 810m@96m(android_root)ubifs" +#define ANDROID_FASTBOOT_NAND_PARTS "16m@64m(boot) 16m@80m(recovery) 1m@96m(misc) 810m@97m(android_root)ubifs" #endif #define CONFIG_CMD_BOOTA diff --git a/include/configs/mx6slevkandroid.h b/include/configs/mx6slevkandroid.h index b12ee80..2aee928 100644 --- a/include/configs/mx6slevkandroid.h +++ b/include/configs/mx6slevkandroid.h @@ -14,6 +14,9 @@ #define CONFIG_USBD_HS #define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_BCB_SUPPORT +#define CONFIG_CMD_READ + #define CONFIG_USB_GADGET #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE diff --git a/include/configs/mx6sxsabreautoandroid.h b/include/configs/mx6sxsabreautoandroid.h index 0da63a7..cfbe92e 100644 --- a/include/configs/mx6sxsabreautoandroid.h +++ b/include/configs/mx6sxsabreautoandroid.h @@ -12,6 +12,19 @@ #define CONFIG_USBD_HS #define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_BCB_SUPPORT +#define CONFIG_CMD_READ +/* For NAND we don't support lock/unlock */ +#ifndef CONFIG_NAND_BOOT +#define CONFIG_FASTBOOT_LOCK +#define FSL_FASTBOOT_FB_DEV "mmc" +#define FASTBOOT_ENCRYPT_LOCK +#define CONFIG_FSL_CAAM_KB +#define CONFIG_CMD_FSL_CAAM_KB +#define CONFIG_SHA1 +#define CONFIG_SHA256 +#endif + #define CONFIG_USB_GADGET #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE @@ -30,14 +43,14 @@ #define CONFIG_FSL_FASTBOOT #define CONFIG_ANDROID_RECOVERY -#if defined CONFIG_SYS_BOOT_NAND +#if defined CONFIG_NAND_BOOT #define CONFIG_FASTBOOT_STORAGE_NAND #else #define CONFIG_FASTBOOT_STORAGE_MMC #endif #if defined(CONFIG_FASTBOOT_STORAGE_NAND) -#define ANDROID_FASTBOOT_NAND_PARTS "16m@64m(boot) 16m@80m(recovery) 810m@96m(android_root)ubifs" +#define ANDROID_FASTBOOT_NAND_PARTS "16m@64m(boot) 16m@80m(recovery) 1m@96m(misc) 810m@97m(android_root)ubifs" #endif #define CONFIG_CMD_BOOTA diff --git a/include/configs/mx6sxsabresdandroid.h b/include/configs/mx6sxsabresdandroid.h index b733665..86ab49e 100644 --- a/include/configs/mx6sxsabresdandroid.h +++ b/include/configs/mx6sxsabresdandroid.h @@ -12,6 +12,19 @@ #define CONFIG_USBD_HS #define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_BCB_SUPPORT +#define CONFIG_CMD_READ +/* For NAND we don't support lock/unlock */ +#ifndef CONFIG_NAND_BOOT +#define CONFIG_FASTBOOT_LOCK +#define FSL_FASTBOOT_FB_DEV "mmc" +#define FASTBOOT_ENCRYPT_LOCK +#define CONFIG_FSL_CAAM_KB +#define CONFIG_CMD_FSL_CAAM_KB +#define CONFIG_SHA1 +#define CONFIG_SHA256 +#endif + #define CONFIG_USB_GADGET #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE diff --git a/include/configs/mx6ul_14x14_evk_android.h b/include/configs/mx6ul_14x14_evk_android.h index 4318cfd..53c0096 100644 --- a/include/configs/mx6ul_14x14_evk_android.h +++ b/include/configs/mx6ul_14x14_evk_android.h @@ -30,7 +30,7 @@ #define CONFIG_FSL_FASTBOOT #define CONFIG_ANDROID_RECOVERY -#if defined CONFIG_SYS_BOOT_NAND +#if defined CONFIG_NAND_BOOT #define CONFIG_FASTBOOT_STORAGE_NAND #else #define CONFIG_FASTBOOT_STORAGE_MMC diff --git a/include/configs/mx7dsabresdandroid.h b/include/configs/mx7dsabresdandroid.h index da06742..a545f00 100644 --- a/include/configs/mx7dsabresdandroid.h +++ b/include/configs/mx7dsabresdandroid.h @@ -12,6 +12,9 @@ #define CONFIG_USBD_HS #define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_BCB_SUPPORT +#define CONFIG_CMD_READ + #define CONFIG_USB_GADGET #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE |