Commit 51e281b664e87e0242328446bc3f1e29f3a677d4

Authored by Luo Ji
1 parent 60868c0f46

MA-11626-4 [Android] Enable AVB only for legacy i.mx6/7

Open configs to enable AVB only for legacy i.mx6/7.

Change-Id: I54d6b96e8b10250d3370cc8323ee16e1c0edc051
Signed-off-by: Luo Ji <ji.luo@nxp.com>

Showing 6 changed files with 95 additions and 0 deletions Side-by-side Diff

include/configs/mx6sabreandroid_common.h
... ... @@ -19,5 +19,21 @@
19 19 #define CONFIG_SHA1
20 20 #define CONFIG_SHA256
21 21  
  22 +#define CONFIG_AVB_SUPPORT
  23 +#ifdef CONFIG_AVB_SUPPORT
  24 +#define CONFIG_ANDROID_RECOVERY
  25 +
  26 +#ifdef CONFIG_SYS_CBSIZE
  27 +#undef CONFIG_SYS_CBSIZE
  28 +#define CONFIG_SYS_CBSIZE 2048
  29 +#endif
  30 +
  31 +#ifdef CONFIG_SYS_MALLOC_LEN
  32 +#undef CONFIG_SYS_MALLOC_LEN
  33 +#define CONFIG_SYS_MALLOC_LEN (96 * SZ_1M)
  34 +#endif
  35 +
  36 +#endif /* CONFIG_AVB_SUPPORT */
  37 +
22 38 #endif /* MX6_SABRE_ANDROID_COMMON_H */
include/configs/mx6slevkandroid.h
... ... @@ -33,5 +33,21 @@
33 33 #define CONFIG_MXC_KPD_COLMAX 4
34 34 #define CONFIG_MXC_KPD_ROWMAX 4
35 35  
  36 +#define CONFIG_AVB_SUPPORT
  37 +#ifdef CONFIG_AVB_SUPPORT
  38 +#define CONFIG_ANDROID_RECOVERY
  39 +
  40 +#ifdef CONFIG_SYS_CBSIZE
  41 +#undef CONFIG_SYS_CBSIZE
  42 +#define CONFIG_SYS_CBSIZE 2048
  43 +#endif
  44 +
  45 +#ifdef CONFIG_SYS_MALLOC_LEN
  46 +#undef CONFIG_SYS_MALLOC_LEN
  47 +#define CONFIG_SYS_MALLOC_LEN (96 * SZ_1M)
  48 +#endif
  49 +
  50 +#endif /* CONFIG_AVB_SUPPORT */
  51 +
36 52 #endif
include/configs/mx6sxsabreautoandroid.h
... ... @@ -20,5 +20,21 @@
20 20 #define CONFIG_SHA1
21 21 #define CONFIG_SHA256
22 22  
  23 +#define CONFIG_AVB_SUPPORT
  24 +#ifdef CONFIG_AVB_SUPPORT
  25 +#define CONFIG_ANDROID_RECOVERY
  26 +
  27 +#ifdef CONFIG_SYS_CBSIZE
  28 +#undef CONFIG_SYS_CBSIZE
  29 +#define CONFIG_SYS_CBSIZE 2048
  30 +#endif
  31 +
  32 +#ifdef CONFIG_SYS_MALLOC_LEN
  33 +#undef CONFIG_SYS_MALLOC_LEN
  34 +#define CONFIG_SYS_MALLOC_LEN (96 * SZ_1M)
  35 +#endif
  36 +
  37 +#endif /* CONFIG_AVB_SUPPORT */
  38 +
23 39 #endif
include/configs/mx6sxsabresdandroid.h
... ... @@ -23,5 +23,21 @@
23 23 #define CONFIG_SHA256
24 24 #endif
25 25  
  26 +#define CONFIG_AVB_SUPPORT
  27 +#ifdef CONFIG_AVB_SUPPORT
  28 +#define CONFIG_ANDROID_RECOVERY
  29 +
  30 +#ifdef CONFIG_SYS_CBSIZE
  31 +#undef CONFIG_SYS_CBSIZE
  32 +#define CONFIG_SYS_CBSIZE 2048
  33 +#endif
  34 +
  35 +#ifdef CONFIG_SYS_MALLOC_LEN
  36 +#undef CONFIG_SYS_MALLOC_LEN
  37 +#define CONFIG_SYS_MALLOC_LEN (96 * SZ_1M)
  38 +#endif
  39 +
  40 +#endif /* CONFIG_AVB_SUPPORT */
  41 +
26 42 #endif
include/configs/mx7dsabresdandroid.h
... ... @@ -18,5 +18,21 @@
18 18 #define CONFIG_FSL_CAAM_KB
19 19 #define CONFIG_SHA1
20 20  
  21 +#define CONFIG_AVB_SUPPORT
  22 +#ifdef CONFIG_AVB_SUPPORT
  23 +#define CONFIG_ANDROID_RECOVERY
  24 +
  25 +#ifdef CONFIG_SYS_CBSIZE
  26 +#undef CONFIG_SYS_CBSIZE
  27 +#define CONFIG_SYS_CBSIZE 2048
  28 +#endif
  29 +
  30 +#ifdef CONFIG_SYS_MALLOC_LEN
  31 +#undef CONFIG_SYS_MALLOC_LEN
  32 +#define CONFIG_SYS_MALLOC_LEN (96 * SZ_1M)
  33 +#endif
  34 +
  35 +#endif /* CONFIG_AVB_SUPPORT */
  36 +
21 37 #endif /* __MX7D_SABRESD_ANDROID_H */
include/configs/mx7ulp_evk_android.h
... ... @@ -15,6 +15,21 @@
15 15 #define CONFIG_CMD_EXT4
16 16 #define CONFIG_CMD_EXT4_WRITE
17 17  
  18 +#define CONFIG_AVB_SUPPORT
  19 +#define CONFIG_FASTBOOT_LOCK
  20 +#define FSL_FASTBOOT_FB_DEV "mmc"
  21 +
  22 +#define CONFIG_ANDROID_RECOVERY
  23 +
  24 +#ifdef CONFIG_SYS_CBSIZE
  25 +#undef CONFIG_SYS_CBSIZE
  26 +#define CONFIG_SYS_CBSIZE 2048
  27 +#endif
  28 +
  29 +#ifdef CONFIG_SYS_MALLOC_LEN
  30 +#undef CONFIG_SYS_MALLOC_LEN
  31 +#define CONFIG_SYS_MALLOC_LEN (96 * SZ_1M)
  32 +#endif
18 33  
19 34 #endif