Commit 873587f1c07ab860b8d3f92864e4de01b7b376ff

Authored by BJ DevOps Team

Merge remote-tracking branch 'origin/imx_v2020.04' into lf_v2020.04

* origin/imx_v2020.04:
  MA-18635 Android: eliminate build warnings
  MA-18634-2 Android: sync config change
  MA-18634-1 Android: refine config dependency

Showing 65 changed files Side-by-side Diff

arch/arm/mach-imx/Kconfig
... ... @@ -228,11 +228,110 @@
228 228 This information is shared with the user via mkimage -l just so the
229 229 image can be signed.
230 230  
  231 +config ANDROID_SUPPORT
  232 + bool "Standard Android features support"
  233 + default n
  234 + select FSL_FASTBOOT
  235 + select FASTBOOT_LOCK
  236 + select BCB_SUPPORT
  237 + select ANDROID_RECOVERY
  238 + select SUPPORT_RAW_INITRD
  239 + select LIBAVB
  240 + select AVB_SUPPORT
  241 +
  242 +config ANDROID_AUTO_SUPPORT
  243 + bool "Android Automotive features support"
  244 + default n
  245 + select FSL_FASTBOOT
  246 + select FASTBOOT_LOCK
  247 + select BCB_SUPPORT
  248 + select ANDROID_RECOVERY
  249 + select SUPPORT_RAW_INITRD
  250 + select LIBAVB
  251 + select AVB_SUPPORT
  252 +
  253 +config ANDROID_THINGS_SUPPORT
  254 + bool "Android Things features support"
  255 + default n
  256 + select FSL_FASTBOOT
  257 + select FASTBOOT_LOCK
  258 + select BCB_SUPPORT
  259 + select ANDROID_RECOVERY
  260 + select SUPPORT_RAW_INITRD
  261 + select LIBAVB
  262 + select AVB_SUPPORT
  263 +
  264 +config AT_AUTHENTICATE_UNLOCK
  265 + bool "Enable authenticate unlock for Android Things devices"
  266 + depends on ANDROID_THINGS_SUPPORT
  267 +
  268 +config ANDROID_AB_SUPPORT
  269 + bool "Android A/B slots support"
  270 + depends on ANDROID_SUPPORT || ANDROID_AUTO_SUPPORT || ANDROID_THINGS_SUPPORT
  271 + default n
  272 + select SYSTEM_RAMDISK_SUPPORT
  273 +
  274 +config SYSTEM_RAMDISK_SUPPORT
  275 + bool "Support build ramdisk in system image"
  276 + default n
  277 +
  278 +menu "TRUSTY OS Support"
  279 +
231 280 config IMX_TRUSTY_OS
232 281 bool "Support Trusty OS related feature"
233 282 depends on ARCH_MX6 || ARCH_MX7 || ARCH_IMX8 || ARCH_IMX8M
234 283 select SYS_ARM_CACHE_WRITEALLOC
  284 + select CMD_MMC_RPMB
  285 + select SUPPORT_EMMC_RPMB
235 286  
236 287 config SYS_ARM_CACHE_WRITEALLOC
237 288 bool "support cache write alloc"
  289 +
  290 +config TRUSTY_UNLOCK_PERMISSION
  291 + bool "Support unlock permission protection in trusty"
  292 + default y
  293 + depends on IMX_TRUSTY_OS
  294 +
  295 +config LOAD_KEY_FROM_RPMB
  296 + bool "Support load AVB public key from RPMB storage"
  297 + default y
  298 + depends on IMX_TRUSTY_OS
  299 +
  300 +config ID_ATTESTATION
  301 + bool "Support device ID attestation"
  302 + default y
  303 + depends on IMX_TRUSTY_OS
  304 +
  305 +config ATTESTATION_ID_PRODUCT
  306 + string "Product name for ID attestation"
  307 + depends on IMX_TRUSTY_OS && ID_ATTESTATION
  308 + default SYS_CONFIG_NAME
  309 +
  310 +config SECURE_UNLOCK
  311 + bool "Enable secure unlock for Android devices, it can only be enabled on HAB closed board"
  312 + depends on IMX_TRUSTY_OS
  313 +
  314 +endmenu
  315 +
  316 +config APPEND_BOOTARGS
  317 + bool "Append bootargs support"
  318 +
  319 +config DUAL_BOOTLOADER
  320 + bool "Enable dual bootloader support"
  321 + select SPL_MMC_SUPPORT
  322 + select SPL_MMC_WRITE
  323 + help
  324 + Enable A/B bootloader select in SPL.
  325 +
  326 +config ANDROID_DYNAMIC_PARTITION
  327 + bool "Support to boot up Android with system image in logical partitions"
  328 +
  329 +config VIRTUAL_AB_SUPPORT
  330 + bool "Support virtual AB update"
  331 + select ANDROID_DYNAMIC_PARTITION
  332 +
  333 +config BOOTLOADER_MENU
  334 + bool "Enable bootloader menu for android device"
  335 + help
  336 + bootloader menu feature for android device.
board/freescale/imx8mm_evk/Kconfig
... ... @@ -9,6 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "imx8mm_evk"
11 11  
  12 +config IMX8M_1G_MEMORY
  13 + bool "imx8m 1GB memory size"
  14 +
12 15 source "board/freescale/common/Kconfig"
13 16  
14 17 endif
configs/imx8mm_ddr4_evk_android_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-ddr4.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-ddr4.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
33 33  
34 34  
... ... @@ -134,18 +134,12 @@
134 134 CONFIG_SYS_WHITE_ON_BLACK=y
135 135  
136 136 CONFIG_LZ4=y
137   -CONFIG_BCB_SUPPORT=y
138   -CONFIG_ANDROID_RECOVERY=y
139   -CONFIG_SUPPORT_RAW_INITRD=y
140 137 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
141   -CONFIG_FSL_FASTBOOT=y
142   -CONFIG_FASTBOOT_LOCK=y
143   -CONFIG_CMD_BOOTA=y
144   -CONFIG_LIBAVB=y
145   -CONFIG_AVB_SUPPORT=y
146 138 CONFIG_APPEND_BOOTARGS=y
147 139 CONFIG_AVB_WARNING_LOGO=y
148 140 CONFIG_AVB_WARNING_LOGO_COLS=0x320
149 141 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
150 142 CONFIG_VIRTUAL_AB_SUPPORT=y
  143 +CONFIG_ANDROID_SUPPORT=y
  144 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mm_ddr4_evk_android_uuu_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-ddr4.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-ddr4.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
... ... @@ -124,8 +124,7 @@
124 124 CONFIG_NAND_MXS_DT=y
125 125  
126 126 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
127   -CONFIG_FSL_FASTBOOT=y
128   -CONFIG_FASTBOOT_LOCK=y
129   -CONFIG_LIBAVB=y
130   -CONFIG_AVB_SUPPORT=y
  127 +CONFIG_ANDROID_SUPPORT=y
  128 +CONFIG_ANDROID_AB_SUPPORT=y
  129 +CONFIG_CMD_BOOTA=n
configs/imx8mm_evk_1g_ddr_android_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg, ANDROID_SUPPORT, ANDROID_LOW_MEMORY"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
33 33  
34 34  
... ... @@ -129,14 +129,9 @@
129 129 CONFIG_SDP_LOADADDR=0x40400000
130 130  
131 131 CONFIG_LZ4=y
132   -CONFIG_BCB_SUPPORT=y
133   -CONFIG_ANDROID_RECOVERY=y
134   -CONFIG_SUPPORT_RAW_INITRD=y
135 132 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
136   -CONFIG_FSL_FASTBOOT=y
137   -CONFIG_FASTBOOT_LOCK=y
138   -CONFIG_CMD_BOOTA=y
139   -CONFIG_LIBAVB=y
140   -CONFIG_AVB_SUPPORT=y
141 133 CONFIG_APPEND_BOOTARGS=y
  134 +CONFIG_IMX8M_1G_MEMORY=y
  135 +CONFIG_ANDROID_SUPPORT=y
  136 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mm_evk_4g_android_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
33 33  
34 34  
... ... @@ -129,15 +129,9 @@
129 129 CONFIG_SDP_LOADADDR=0x40400000
130 130  
131 131 CONFIG_LZ4=y
132   -CONFIG_BCB_SUPPORT=y
133   -CONFIG_ANDROID_RECOVERY=y
134   -CONFIG_SUPPORT_RAW_INITRD=y
135 132 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
136   -CONFIG_FSL_FASTBOOT=y
137   -CONFIG_FASTBOOT_LOCK=y
138   -CONFIG_CMD_BOOTA=y
139   -CONFIG_LIBAVB=y
140   -CONFIG_AVB_SUPPORT=y
141 133 CONFIG_APPEND_BOOTARGS=y
142 134 CONFIG_IMX8M_4G_LPDDR4=y
  135 +CONFIG_ANDROID_SUPPORT=y
  136 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mm_evk_4g_android_trusty_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
33 33  
34 34  
35 35  
36 36  
... ... @@ -129,19 +129,10 @@
129 129 CONFIG_SDP_LOADADDR=0x40400000
130 130  
131 131 CONFIG_LZ4=y
132   -CONFIG_BCB_SUPPORT=y
133   -CONFIG_ANDROID_RECOVERY=y
134   -CONFIG_SUPPORT_RAW_INITRD=y
135 132 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
136   -CONFIG_FSL_FASTBOOT=y
137   -CONFIG_FASTBOOT_LOCK=y
138   -CONFIG_CMD_BOOTA=y
139   -CONFIG_LIBAVB=y
140   -CONFIG_AVB_SUPPORT=y
141 133 CONFIG_APPEND_BOOTARGS=y
142   -CONFIG_CMD_MMC_RPMB=y
143   -CONFIG_SUPPORT_EMMC_RPMB=y
144 134 CONFIG_IMX_TRUSTY_OS=y
145   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
146 135 CONFIG_IMX8M_4G_LPDDR4=y
  136 +CONFIG_ANDROID_SUPPORT=y
  137 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mm_evk_4g_android_uuu_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
33 33  
... ... @@ -129,9 +129,8 @@
129 129 CONFIG_SDP_LOADADDR=0x40400000
130 130  
131 131 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
132   -CONFIG_FSL_FASTBOOT=y
133   -CONFIG_FASTBOOT_LOCK=y
134   -CONFIG_LIBAVB=y
135   -CONFIG_AVB_SUPPORT=y
136 132 CONFIG_IMX8M_4G_LPDDR4=y
  133 +CONFIG_ANDROID_SUPPORT=y
  134 +CONFIG_ANDROID_AB_SUPPORT=y
  135 +CONFIG_CMD_BOOTA=n
configs/imx8mm_evk_android_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
33 33  
... ... @@ -139,15 +139,9 @@
139 139 CONFIG_SYS_WHITE_ON_BLACK=y
140 140  
141 141 CONFIG_LZ4=y
142   -CONFIG_BCB_SUPPORT=y
143   -CONFIG_ANDROID_RECOVERY=y
144   -CONFIG_SUPPORT_RAW_INITRD=y
  142 +CONFIG_ANDROID_SUPPORT=y
  143 +CONFIG_ANDROID_AB_SUPPORT=y
145 144 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
146   -CONFIG_FSL_FASTBOOT=y
147   -CONFIG_FASTBOOT_LOCK=y
148   -CONFIG_CMD_BOOTA=y
149   -CONFIG_LIBAVB=y
150   -CONFIG_AVB_SUPPORT=y
151 145 CONFIG_APPEND_BOOTARGS=y
152 146 CONFIG_AVB_WARNING_LOGO=y
153 147 CONFIG_AVB_WARNING_LOGO_COLS=0x320
configs/imx8mm_evk_android_dual_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
33 33  
34 34  
35 35  
... ... @@ -139,20 +139,13 @@
139 139 CONFIG_SYS_WHITE_ON_BLACK=y
140 140  
141 141 CONFIG_LZ4=y
142   -CONFIG_BCB_SUPPORT=y
143   -CONFIG_ANDROID_RECOVERY=y
144   -CONFIG_SUPPORT_RAW_INITRD=y
145 142 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
146   -CONFIG_FSL_FASTBOOT=y
147   -CONFIG_FASTBOOT_LOCK=y
148   -CONFIG_CMD_BOOTA=y
149   -CONFIG_LIBAVB=y
150   -CONFIG_AVB_SUPPORT=y
151 143 CONFIG_APPEND_BOOTARGS=y
152 144 CONFIG_DUAL_BOOTLOADER=y
153   -CONFIG_SPL_MMC_WRITE=y
154 145 CONFIG_AVB_WARNING_LOGO=y
155 146 CONFIG_AVB_WARNING_LOGO_COLS=0x320
156 147 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
157 148 CONFIG_VIRTUAL_AB_SUPPORT=y
  149 +CONFIG_ANDROID_SUPPORT=y
  150 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mm_evk_android_trusty_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
33 33  
34 34  
35 35  
36 36  
... ... @@ -139,24 +139,13 @@
139 139 CONFIG_SYS_WHITE_ON_BLACK=y
140 140  
141 141 CONFIG_LZ4=y
142   -CONFIG_BCB_SUPPORT=y
143   -CONFIG_ANDROID_RECOVERY=y
144   -CONFIG_SUPPORT_RAW_INITRD=y
  142 +CONFIG_ANDROID_SUPPORT=y
  143 +CONFIG_ANDROID_AB_SUPPORT=y
145 144 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
146   -CONFIG_FSL_FASTBOOT=y
147   -CONFIG_FASTBOOT_LOCK=y
148   -CONFIG_CMD_BOOTA=y
149   -CONFIG_LIBAVB=y
150   -CONFIG_AVB_SUPPORT=y
151 145 CONFIG_APPEND_BOOTARGS=y
152   -CONFIG_CMD_MMC_RPMB=y
153   -CONFIG_SUPPORT_EMMC_RPMB=y
154 146 CONFIG_IMX_TRUSTY_OS=y
155   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
156 147 CONFIG_AVB_WARNING_LOGO=y
157 148 CONFIG_AVB_WARNING_LOGO_COLS=0x320
158 149 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
159 150 CONFIG_VIRTUAL_AB_SUPPORT=y
160   -CONFIG_LOAD_KEY_FROM_RPMB=y
161   -CONFIG_ID_ATTESTATION=y
configs/imx8mm_evk_android_trusty_dual_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
33 33  
34 34  
35 35  
36 36  
... ... @@ -139,26 +139,14 @@
139 139 CONFIG_SYS_WHITE_ON_BLACK=y
140 140  
141 141 CONFIG_LZ4=y
142   -CONFIG_BCB_SUPPORT=y
143   -CONFIG_ANDROID_RECOVERY=y
144   -CONFIG_SUPPORT_RAW_INITRD=y
145 142 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
146   -CONFIG_FSL_FASTBOOT=y
147   -CONFIG_FASTBOOT_LOCK=y
148   -CONFIG_CMD_BOOTA=y
149   -CONFIG_LIBAVB=y
150   -CONFIG_AVB_SUPPORT=y
151 143 CONFIG_APPEND_BOOTARGS=y
152 144 CONFIG_DUAL_BOOTLOADER=y
153   -CONFIG_SPL_MMC_WRITE=y
154   -CONFIG_CMD_MMC_RPMB=y
155   -CONFIG_SUPPORT_EMMC_RPMB=y
156 145 CONFIG_IMX_TRUSTY_OS=y
157   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
158 146 CONFIG_AVB_WARNING_LOGO=y
159 147 CONFIG_AVB_WARNING_LOGO_COLS=0x320
160 148 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
161 149 CONFIG_VIRTUAL_AB_SUPPORT=y
162   -CONFIG_LOAD_KEY_FROM_RPMB=y
163   -CONFIG_ID_ATTESTATION=y
  150 +CONFIG_ANDROID_SUPPORT=y
  151 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mm_evk_android_trusty_secure_unlock_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
33 33  
34 34  
35 35  
36 36  
... ... @@ -139,26 +139,15 @@
139 139 CONFIG_SYS_WHITE_ON_BLACK=y
140 140  
141 141 CONFIG_LZ4=y
142   -CONFIG_BCB_SUPPORT=y
143   -CONFIG_ANDROID_RECOVERY=y
144   -CONFIG_SUPPORT_RAW_INITRD=y
145 142 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
146   -CONFIG_FSL_FASTBOOT=y
147   -CONFIG_FASTBOOT_LOCK=y
148   -CONFIG_CMD_BOOTA=y
149   -CONFIG_LIBAVB=y
150   -CONFIG_AVB_SUPPORT=y
151 143 CONFIG_APPEND_BOOTARGS=y
152   -CONFIG_CMD_MMC_RPMB=y
153   -CONFIG_SUPPORT_EMMC_RPMB=y
154 144 CONFIG_IMX_TRUSTY_OS=y
155   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
156 145 CONFIG_SECURE_UNLOCK=y
157 146 CONFIG_IMX_HAB=y
158 147 CONFIG_AVB_WARNING_LOGO=y
159 148 CONFIG_AVB_WARNING_LOGO_COLS=0x320
160 149 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
161 150 CONFIG_VIRTUAL_AB_SUPPORT=y
162   -CONFIG_LOAD_KEY_FROM_RPMB=y
163   -CONFIG_ID_ATTESTATION=y
  151 +CONFIG_ANDROID_SUPPORT=y
  152 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mm_evk_android_uuu_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
... ... @@ -129,8 +129,7 @@
129 129 CONFIG_SDP_LOADADDR=0x40400000
130 130  
131 131 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
132   -CONFIG_FSL_FASTBOOT=y
133   -CONFIG_FASTBOOT_LOCK=y
134   -CONFIG_LIBAVB=y
135   -CONFIG_AVB_SUPPORT=y
  132 +CONFIG_ANDROID_SUPPORT=y
  133 +CONFIG_ANDROID_AB_SUPPORT=y
  134 +CONFIG_CMD_BOOTA=n
configs/imx8mn_ddr4_evk_android_defconfig
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_SPL_LOAD_FIT=y
28 28 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
29 29 CONFIG_OF_SYSTEM_SETUP=y
30   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg, ANDROID_SUPPORT"
  30 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg"
31 31 CONFIG_DEFAULT_FDT_FILE="imx8mn-ddr4-evk.dtb"
32 32 CONFIG_BOARD_LATE_INIT=y
33 33 CONFIG_BOARD_EARLY_INIT_F=y
34 34  
35 35  
... ... @@ -138,19 +138,13 @@
138 138 CONFIG_SYS_WHITE_ON_BLACK=y
139 139  
140 140 CONFIG_LZ4=y
141   -CONFIG_BCB_SUPPORT=y
142   -CONFIG_ANDROID_RECOVERY=y
143   -CONFIG_SUPPORT_RAW_INITRD=y
144 141 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
145   -CONFIG_FSL_FASTBOOT=y
146   -CONFIG_FASTBOOT_LOCK=y
147   -CONFIG_CMD_BOOTA=y
148   -CONFIG_LIBAVB=y
149   -CONFIG_AVB_SUPPORT=y
150 142 CONFIG_APPEND_BOOTARGS=y
151 143 CONFIG_SPL_MMC_SUPPORT=y
152 144 CONFIG_AVB_WARNING_LOGO=y
153 145 CONFIG_AVB_WARNING_LOGO_COLS=0x320
154 146 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
155 147 CONFIG_VIRTUAL_AB_SUPPORT=y
  148 +CONFIG_ANDROID_SUPPORT=y
  149 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mn_ddr4_evk_android_uuu_defconfig
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_SPL_LOAD_FIT=y
28 28 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
29 29 CONFIG_OF_SYSTEM_SETUP=y
30   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg, ANDROID_SUPPORT"
  30 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg"
31 31 CONFIG_DEFAULT_FDT_FILE="imx8mn-ddr4-evk.dtb"
32 32 CONFIG_BOARD_LATE_INIT=y
33 33 CONFIG_BOARD_EARLY_INIT_F=y
... ... @@ -129,8 +129,7 @@
129 129 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
130 130  
131 131 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
132   -CONFIG_FSL_FASTBOOT=y
133   -CONFIG_FASTBOOT_LOCK=y
134   -CONFIG_LIBAVB=y
135   -CONFIG_AVB_SUPPORT=y
  132 +CONFIG_ANDROID_SUPPORT=y
  133 +CONFIG_ANDROID_AB_SUPPORT=y
  134 +CONFIG_CMD_BOOTA=n
configs/imx8mn_evk_android_defconfig
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_SPL_LOAD_FIT=y
28 28 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
29 29 CONFIG_OF_SYSTEM_SETUP=y
30   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg, ANDROID_SUPPORT"
  30 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
31 31 CONFIG_DEFAULT_FDT_FILE="imx8mn-evk.dtb"
32 32 CONFIG_BOARD_LATE_INIT=y
33 33 CONFIG_BOARD_EARLY_INIT_F=y
34 34  
35 35  
... ... @@ -138,19 +138,13 @@
138 138 CONFIG_SYS_WHITE_ON_BLACK=y
139 139  
140 140 CONFIG_LZ4=y
141   -CONFIG_BCB_SUPPORT=y
142   -CONFIG_ANDROID_RECOVERY=y
143   -CONFIG_SUPPORT_RAW_INITRD=y
144 141 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
145   -CONFIG_FSL_FASTBOOT=y
146   -CONFIG_FASTBOOT_LOCK=y
147   -CONFIG_CMD_BOOTA=y
148   -CONFIG_LIBAVB=y
149   -CONFIG_AVB_SUPPORT=y
150 142 CONFIG_APPEND_BOOTARGS=y
151 143 CONFIG_SPL_MMC_SUPPORT=y
152 144 CONFIG_AVB_WARNING_LOGO=y
153 145 CONFIG_AVB_WARNING_LOGO_COLS=0x320
154 146 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
155 147 CONFIG_VIRTUAL_AB_SUPPORT=y
  148 +CONFIG_ANDROID_SUPPORT=y
  149 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mn_evk_android_dual_defconfig
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_SPL_LOAD_FIT=y
28 28 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
29 29 CONFIG_OF_SYSTEM_SETUP=y
30   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg, ANDROID_SUPPORT"
  30 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
31 31 CONFIG_DEFAULT_FDT_FILE="imx8mn-evk.dtb"
32 32 CONFIG_BOARD_LATE_INIT=y
33 33 CONFIG_BOARD_EARLY_INIT_F=y
34 34  
35 35  
36 36  
37 37  
... ... @@ -138,21 +138,13 @@
138 138 CONFIG_SYS_WHITE_ON_BLACK=y
139 139  
140 140 CONFIG_LZ4=y
141   -CONFIG_BCB_SUPPORT=y
142   -CONFIG_ANDROID_RECOVERY=y
143   -CONFIG_SUPPORT_RAW_INITRD=y
144 141 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
145   -CONFIG_FSL_FASTBOOT=y
146   -CONFIG_FASTBOOT_LOCK=y
147   -CONFIG_CMD_BOOTA=y
148   -CONFIG_LIBAVB=y
149   -CONFIG_AVB_SUPPORT=y
150 142 CONFIG_APPEND_BOOTARGS=y
151   -CONFIG_SPL_MMC_SUPPORT=y
152 143 CONFIG_DUAL_BOOTLOADER=y
153   -CONFIG_SPL_MMC_WRITE=y
154 144 CONFIG_AVB_WARNING_LOGO=y
155 145 CONFIG_AVB_WARNING_LOGO_COLS=0x320
156 146 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
157 147 CONFIG_VIRTUAL_AB_SUPPORT=y
  148 +CONFIG_ANDROID_SUPPORT=y
  149 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mn_evk_android_trusty_defconfig
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_SPL_LOAD_FIT=y
28 28 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
29 29 CONFIG_OF_SYSTEM_SETUP=y
30   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg, ANDROID_SUPPORT"
  30 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
31 31 CONFIG_DEFAULT_FDT_FILE="imx8mn-evk.dtb"
32 32 CONFIG_BOARD_LATE_INIT=y
33 33 CONFIG_BOARD_EARLY_INIT_F=y
34 34  
35 35  
36 36  
37 37  
... ... @@ -138,25 +138,14 @@
138 138 CONFIG_SYS_WHITE_ON_BLACK=y
139 139  
140 140 CONFIG_LZ4=y
141   -CONFIG_BCB_SUPPORT=y
142   -CONFIG_ANDROID_RECOVERY=y
143   -CONFIG_SUPPORT_RAW_INITRD=y
144 141 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
145   -CONFIG_FSL_FASTBOOT=y
146   -CONFIG_FASTBOOT_LOCK=y
147   -CONFIG_CMD_BOOTA=y
148   -CONFIG_LIBAVB=y
149   -CONFIG_AVB_SUPPORT=y
150 142 CONFIG_APPEND_BOOTARGS=y
151 143 CONFIG_SPL_MMC_SUPPORT=y
152   -CONFIG_CMD_MMC_RPMB=y
153   -CONFIG_SUPPORT_EMMC_RPMB=y
154 144 CONFIG_IMX_TRUSTY_OS=y
155   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
156 145 CONFIG_AVB_WARNING_LOGO=y
157 146 CONFIG_AVB_WARNING_LOGO_COLS=0x320
158 147 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
159 148 CONFIG_VIRTUAL_AB_SUPPORT=y
160   -CONFIG_LOAD_KEY_FROM_RPMB=y
161   -CONFIG_ID_ATTESTATION=y
  149 +CONFIG_ANDROID_SUPPORT=y
  150 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mn_evk_android_trusty_dual_defconfig
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_SPL_LOAD_FIT=y
28 28 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
29 29 CONFIG_OF_SYSTEM_SETUP=y
30   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg, ANDROID_SUPPORT"
  30 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
31 31 CONFIG_DEFAULT_FDT_FILE="imx8mn-evk.dtb"
32 32 CONFIG_BOARD_LATE_INIT=y
33 33 CONFIG_BOARD_EARLY_INIT_F=y
34 34  
35 35  
36 36  
37 37  
38 38  
... ... @@ -138,27 +138,14 @@
138 138 CONFIG_SYS_WHITE_ON_BLACK=y
139 139  
140 140 CONFIG_LZ4=y
141   -CONFIG_BCB_SUPPORT=y
142   -CONFIG_ANDROID_RECOVERY=y
143   -CONFIG_SUPPORT_RAW_INITRD=y
144 141 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
145   -CONFIG_FSL_FASTBOOT=y
146   -CONFIG_FASTBOOT_LOCK=y
147   -CONFIG_CMD_BOOTA=y
148   -CONFIG_LIBAVB=y
149   -CONFIG_AVB_SUPPORT=y
150 142 CONFIG_APPEND_BOOTARGS=y
151   -CONFIG_SPL_MMC_SUPPORT=y
152   -CONFIG_CMD_MMC_RPMB=y
153   -CONFIG_SUPPORT_EMMC_RPMB=y
154 143 CONFIG_IMX_TRUSTY_OS=y
155   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
156 144 CONFIG_DUAL_BOOTLOADER=y
157   -CONFIG_SPL_MMC_WRITE=y
158 145 CONFIG_AVB_WARNING_LOGO=y
159 146 CONFIG_AVB_WARNING_LOGO_COLS=0x320
160 147 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
161 148 CONFIG_VIRTUAL_AB_SUPPORT=y
162   -CONFIG_LOAD_KEY_FROM_RPMB=y
163   -CONFIG_ID_ATTESTATION=y
  149 +CONFIG_ANDROID_SUPPORT=y
  150 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mn_evk_android_trusty_secure_unlock_defconfig
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_SPL_LOAD_FIT=y
28 28 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
29 29 CONFIG_OF_SYSTEM_SETUP=y
30   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg, ANDROID_SUPPORT"
  30 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
31 31 CONFIG_DEFAULT_FDT_FILE="imx8mn-evk.dtb"
32 32 CONFIG_BOARD_LATE_INIT=y
33 33 CONFIG_BOARD_EARLY_INIT_F=y
34 34  
35 35  
36 36  
37 37  
... ... @@ -138,27 +138,16 @@
138 138 CONFIG_SYS_WHITE_ON_BLACK=y
139 139  
140 140 CONFIG_LZ4=y
141   -CONFIG_BCB_SUPPORT=y
142   -CONFIG_ANDROID_RECOVERY=y
143   -CONFIG_SUPPORT_RAW_INITRD=y
144 141 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
145   -CONFIG_FSL_FASTBOOT=y
146   -CONFIG_FASTBOOT_LOCK=y
147   -CONFIG_CMD_BOOTA=y
148   -CONFIG_LIBAVB=y
149   -CONFIG_AVB_SUPPORT=y
150 142 CONFIG_APPEND_BOOTARGS=y
151 143 CONFIG_SPL_MMC_SUPPORT=y
152   -CONFIG_CMD_MMC_RPMB=y
153   -CONFIG_SUPPORT_EMMC_RPMB=y
154 144 CONFIG_IMX_TRUSTY_OS=y
155   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
156 145 CONFIG_SECURE_UNLOCK=y
157 146 CONFIG_IMX_HAB=y
158 147 CONFIG_AVB_WARNING_LOGO=y
159 148 CONFIG_AVB_WARNING_LOGO_COLS=0x320
160 149 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
161 150 CONFIG_VIRTUAL_AB_SUPPORT=y
162   -CONFIG_LOAD_KEY_FROM_RPMB=y
163   -CONFIG_ID_ATTESTATION=y
  151 +CONFIG_ANDROID_SUPPORT=y
  152 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mn_evk_android_uuu_defconfig
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_SPL_LOAD_FIT=y
28 28 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
29 29 CONFIG_OF_SYSTEM_SETUP=y
30   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg, ANDROID_SUPPORT"
  30 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
31 31 CONFIG_DEFAULT_FDT_FILE="imx8mn-evk.dtb"
32 32 CONFIG_BOARD_LATE_INIT=y
33 33 CONFIG_BOARD_EARLY_INIT_F=y
... ... @@ -129,8 +129,7 @@
129 129 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
130 130  
131 131 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
132   -CONFIG_FSL_FASTBOOT=y
133   -CONFIG_FASTBOOT_LOCK=y
134   -CONFIG_LIBAVB=y
135   -CONFIG_AVB_SUPPORT=y
  132 +CONFIG_ANDROID_SUPPORT=y
  133 +CONFIG_ANDROID_AB_SUPPORT=y
  134 +CONFIG_CMD_BOOTA=n
configs/imx8mp_evk_android_defconfig
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_SPL_LOAD_FIT=y
28 28 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
29 29 CONFIG_OF_SYSTEM_SETUP=y
30   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg, ANDROID_SUPPORT"
  30 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg"
31 31 CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb"
32 32 CONFIG_BOARD_LATE_INIT=y
33 33 CONFIG_BOARD_EARLY_INIT_F=y
34 34  
35 35  
... ... @@ -150,19 +150,13 @@
150 150 CONFIG_SYS_WHITE_ON_BLACK=y
151 151  
152 152 CONFIG_LZ4=y
153   -CONFIG_BCB_SUPPORT=y
154   -CONFIG_ANDROID_RECOVERY=y
155   -CONFIG_SUPPORT_RAW_INITRD=y
156 153 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
157   -CONFIG_FSL_FASTBOOT=y
158   -CONFIG_FASTBOOT_LOCK=y
159   -CONFIG_CMD_BOOTA=y
160   -CONFIG_LIBAVB=y
161   -CONFIG_AVB_SUPPORT=y
162 154 CONFIG_APPEND_BOOTARGS=y
163 155 CONFIG_SPL_MMC_SUPPORT=y
164 156 CONFIG_AVB_WARNING_LOGO=y
165 157 CONFIG_AVB_WARNING_LOGO_COLS=0x320
166 158 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
167 159 CONFIG_VIRTUAL_AB_SUPPORT=y
  160 +CONFIG_ANDROID_SUPPORT=y
  161 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mp_evk_android_dual_defconfig
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_SPL_LOAD_FIT=y
28 28 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
29 29 CONFIG_OF_SYSTEM_SETUP=y
30   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg, ANDROID_SUPPORT"
  30 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg"
31 31 CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb"
32 32 CONFIG_BOARD_LATE_INIT=y
33 33 CONFIG_BOARD_EARLY_INIT_F=y
34 34  
35 35  
36 36  
37 37  
... ... @@ -150,21 +150,13 @@
150 150 CONFIG_SYS_WHITE_ON_BLACK=y
151 151  
152 152 CONFIG_LZ4=y
153   -CONFIG_BCB_SUPPORT=y
154   -CONFIG_ANDROID_RECOVERY=y
155   -CONFIG_SUPPORT_RAW_INITRD=y
156 153 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
157   -CONFIG_FSL_FASTBOOT=y
158   -CONFIG_FASTBOOT_LOCK=y
159   -CONFIG_CMD_BOOTA=y
160   -CONFIG_LIBAVB=y
161   -CONFIG_AVB_SUPPORT=y
162 154 CONFIG_APPEND_BOOTARGS=y
163   -CONFIG_SPL_MMC_SUPPORT=y
164 155 CONFIG_DUAL_BOOTLOADER=y
165   -CONFIG_SPL_MMC_WRITE=y
166 156 CONFIG_AVB_WARNING_LOGO=y
167 157 CONFIG_AVB_WARNING_LOGO_COLS=0x320
168 158 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
169 159 CONFIG_VIRTUAL_AB_SUPPORT=y
  160 +CONFIG_ANDROID_SUPPORT=y
  161 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mp_evk_android_powersave_defconfig
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_SPL_LOAD_FIT=y
28 28 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
29 29 CONFIG_OF_SYSTEM_SETUP=y
30   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg, ANDROID_SUPPORT"
  30 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg"
31 31 CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb"
32 32 CONFIG_BOARD_LATE_INIT=y
33 33 CONFIG_BOARD_EARLY_INIT_F=y
34 34  
... ... @@ -150,15 +150,7 @@
150 150 CONFIG_SYS_WHITE_ON_BLACK=y
151 151  
152 152 CONFIG_LZ4=y
153   -CONFIG_BCB_SUPPORT=y
154   -CONFIG_ANDROID_RECOVERY=y
155   -CONFIG_SUPPORT_RAW_INITRD=y
156 153 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
157   -CONFIG_FSL_FASTBOOT=y
158   -CONFIG_FASTBOOT_LOCK=y
159   -CONFIG_CMD_BOOTA=y
160   -CONFIG_LIBAVB=y
161   -CONFIG_AVB_SUPPORT=y
162 154 CONFIG_APPEND_BOOTARGS=y
163 155 CONFIG_SPL_MMC_SUPPORT=y
164 156 CONFIG_AVB_WARNING_LOGO=y
... ... @@ -167,4 +159,6 @@
167 159 CONFIG_VIRTUAL_AB_SUPPORT=y
168 160 CONFIG_IMX8M_VDD_SOC_850MV=y
169 161 CONFIG_IMX8M_LPDDR4_FREQ0_2400MTS=y
  162 +CONFIG_ANDROID_SUPPORT=y
  163 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mp_evk_android_trusty_defconfig
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_SPL_LOAD_FIT=y
28 28 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
29 29 CONFIG_OF_SYSTEM_SETUP=y
30   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg, ANDROID_SUPPORT"
  30 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg"
31 31 CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb"
32 32 CONFIG_BOARD_LATE_INIT=y
33 33 CONFIG_BOARD_EARLY_INIT_F=y
34 34  
35 35  
36 36  
37 37  
... ... @@ -150,25 +150,14 @@
150 150 CONFIG_SYS_WHITE_ON_BLACK=y
151 151  
152 152 CONFIG_LZ4=y
153   -CONFIG_BCB_SUPPORT=y
154   -CONFIG_ANDROID_RECOVERY=y
155   -CONFIG_SUPPORT_RAW_INITRD=y
156 153 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
157   -CONFIG_FSL_FASTBOOT=y
158   -CONFIG_FASTBOOT_LOCK=y
159   -CONFIG_CMD_BOOTA=y
160   -CONFIG_LIBAVB=y
161   -CONFIG_AVB_SUPPORT=y
162 154 CONFIG_APPEND_BOOTARGS=y
163 155 CONFIG_SPL_MMC_SUPPORT=y
164   -CONFIG_CMD_MMC_RPMB=y
165   -CONFIG_SUPPORT_EMMC_RPMB=y
166 156 CONFIG_IMX_TRUSTY_OS=y
167   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
168 157 CONFIG_AVB_WARNING_LOGO=y
169 158 CONFIG_AVB_WARNING_LOGO_COLS=0x320
170 159 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
171 160 CONFIG_VIRTUAL_AB_SUPPORT=y
172   -CONFIG_LOAD_KEY_FROM_RPMB=y
173   -CONFIG_ID_ATTESTATION=y
  161 +CONFIG_ANDROID_SUPPORT=y
  162 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mp_evk_android_trusty_dual_defconfig
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_SPL_LOAD_FIT=y
28 28 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
29 29 CONFIG_OF_SYSTEM_SETUP=y
30   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg, ANDROID_SUPPORT"
  30 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg"
31 31 CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb"
32 32 CONFIG_BOARD_LATE_INIT=y
33 33 CONFIG_BOARD_EARLY_INIT_F=y
34 34  
35 35  
36 36  
37 37  
38 38  
... ... @@ -150,27 +150,14 @@
150 150 CONFIG_SYS_WHITE_ON_BLACK=y
151 151  
152 152 CONFIG_LZ4=y
153   -CONFIG_BCB_SUPPORT=y
154   -CONFIG_ANDROID_RECOVERY=y
155   -CONFIG_SUPPORT_RAW_INITRD=y
156 153 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
157   -CONFIG_FSL_FASTBOOT=y
158   -CONFIG_FASTBOOT_LOCK=y
159   -CONFIG_CMD_BOOTA=y
160   -CONFIG_LIBAVB=y
161   -CONFIG_AVB_SUPPORT=y
162 154 CONFIG_APPEND_BOOTARGS=y
163   -CONFIG_SPL_MMC_SUPPORT=y
164 155 CONFIG_DUAL_BOOTLOADER=y
165   -CONFIG_SPL_MMC_WRITE=y
166   -CONFIG_CMD_MMC_RPMB=y
167   -CONFIG_SUPPORT_EMMC_RPMB=y
168 156 CONFIG_IMX_TRUSTY_OS=y
169   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
170 157 CONFIG_AVB_WARNING_LOGO=y
171 158 CONFIG_AVB_WARNING_LOGO_COLS=0x320
172 159 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
173 160 CONFIG_VIRTUAL_AB_SUPPORT=y
174   -CONFIG_LOAD_KEY_FROM_RPMB=y
175   -CONFIG_ID_ATTESTATION=y
  161 +CONFIG_ANDROID_SUPPORT=y
  162 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mp_evk_android_trusty_powersave_defconfig
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_SPL_LOAD_FIT=y
28 28 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
29 29 CONFIG_OF_SYSTEM_SETUP=y
30   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg, ANDROID_SUPPORT"
  30 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg"
31 31 CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb"
32 32 CONFIG_BOARD_LATE_INIT=y
33 33 CONFIG_BOARD_EARLY_INIT_F=y
34 34  
... ... @@ -150,15 +150,7 @@
150 150 CONFIG_SYS_WHITE_ON_BLACK=y
151 151  
152 152 CONFIG_LZ4=y
153   -CONFIG_BCB_SUPPORT=y
154   -CONFIG_ANDROID_RECOVERY=y
155   -CONFIG_SUPPORT_RAW_INITRD=y
156 153 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
157   -CONFIG_FSL_FASTBOOT=y
158   -CONFIG_FASTBOOT_LOCK=y
159   -CONFIG_CMD_BOOTA=y
160   -CONFIG_LIBAVB=y
161   -CONFIG_AVB_SUPPORT=y
162 154 CONFIG_APPEND_BOOTARGS=y
163 155 CONFIG_SPL_MMC_SUPPORT=y
164 156 CONFIG_AVB_WARNING_LOGO=y
165 157  
... ... @@ -168,10 +160,7 @@
168 160 CONFIG_IMX8M_VDD_SOC_850MV=y
169 161 CONFIG_IMX8M_LPDDR4_FREQ0_2400MTS=y
170 162  
171   -CONFIG_CMD_MMC_RPMB=y
172   -CONFIG_SUPPORT_EMMC_RPMB=y
173 163 CONFIG_IMX_TRUSTY_OS=y
174   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
175   -CONFIG_LOAD_KEY_FROM_RPMB=y
176   -CONFIG_ID_ATTESTATION=y
  164 +CONFIG_ANDROID_SUPPORT=y
  165 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mp_evk_android_trusty_secure_unlock_defconfig
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_SPL_LOAD_FIT=y
28 28 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
29 29 CONFIG_OF_SYSTEM_SETUP=y
30   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg, ANDROID_SUPPORT"
  30 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg"
31 31 CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb"
32 32 CONFIG_BOARD_LATE_INIT=y
33 33 CONFIG_BOARD_EARLY_INIT_F=y
34 34  
35 35  
36 36  
37 37  
... ... @@ -150,27 +150,16 @@
150 150 CONFIG_SYS_WHITE_ON_BLACK=y
151 151  
152 152 CONFIG_LZ4=y
153   -CONFIG_BCB_SUPPORT=y
154   -CONFIG_ANDROID_RECOVERY=y
155   -CONFIG_SUPPORT_RAW_INITRD=y
156 153 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
157   -CONFIG_FSL_FASTBOOT=y
158   -CONFIG_FASTBOOT_LOCK=y
159   -CONFIG_CMD_BOOTA=y
160   -CONFIG_LIBAVB=y
161   -CONFIG_AVB_SUPPORT=y
162 154 CONFIG_APPEND_BOOTARGS=y
163 155 CONFIG_SPL_MMC_SUPPORT=y
164   -CONFIG_CMD_MMC_RPMB=y
165   -CONFIG_SUPPORT_EMMC_RPMB=y
166 156 CONFIG_IMX_TRUSTY_OS=y
167   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
168 157 CONFIG_SECURE_UNLOCK=y
169 158 CONFIG_IMX_HAB=y
170 159 CONFIG_AVB_WARNING_LOGO=y
171 160 CONFIG_AVB_WARNING_LOGO_COLS=0x320
172 161 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
173 162 CONFIG_VIRTUAL_AB_SUPPORT=y
174   -CONFIG_LOAD_KEY_FROM_RPMB=y
175   -CONFIG_ID_ATTESTATION=y
  163 +CONFIG_ANDROID_SUPPORT=y
  164 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mp_evk_android_uuu_defconfig
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_SPL_LOAD_FIT=y
28 28 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
29 29 CONFIG_OF_SYSTEM_SETUP=y
30   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg, ANDROID_SUPPORT"
  30 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg"
31 31 CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb"
32 32 CONFIG_BOARD_LATE_INIT=y
33 33 CONFIG_BOARD_EARLY_INIT_F=y
... ... @@ -142,8 +142,7 @@
142 142 CONFIG_OF_BOARD_SETUP=y
143 143  
144 144 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
145   -CONFIG_FSL_FASTBOOT=y
146   -CONFIG_FASTBOOT_LOCK=y
147   -CONFIG_LIBAVB=y
148   -CONFIG_AVB_SUPPORT=y
  145 +CONFIG_ANDROID_SUPPORT=y
  146 +CONFIG_ANDROID_AB_SUPPORT=y
  147 +CONFIG_CMD_BOOTA=n
configs/imx8mq_evk_android_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
33 33  
34 34  
... ... @@ -131,18 +131,12 @@
131 131 CONFIG_SYS_WHITE_ON_BLACK=y
132 132  
133 133 CONFIG_LZ4=y
134   -CONFIG_BCB_SUPPORT=y
135   -CONFIG_ANDROID_RECOVERY=y
136   -CONFIG_SUPPORT_RAW_INITRD=y
137 134 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
138   -CONFIG_FSL_FASTBOOT=y
139   -CONFIG_FASTBOOT_LOCK=y
140   -CONFIG_CMD_BOOTA=y
141   -CONFIG_LIBAVB=y
142   -CONFIG_AVB_SUPPORT=y
143 135 CONFIG_APPEND_BOOTARGS=y
144 136 CONFIG_AVB_WARNING_LOGO=y
145 137 CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
146 138 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
147 139 CONFIG_VIRTUAL_AB_SUPPORT=y
  140 +CONFIG_ANDROID_SUPPORT=y
  141 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mq_evk_android_dual_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
33 33  
34 34  
35 35  
... ... @@ -131,20 +131,13 @@
131 131 CONFIG_SYS_WHITE_ON_BLACK=y
132 132  
133 133 CONFIG_LZ4=y
134   -CONFIG_BCB_SUPPORT=y
135   -CONFIG_ANDROID_RECOVERY=y
136   -CONFIG_SUPPORT_RAW_INITRD=y
137 134 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
138   -CONFIG_FSL_FASTBOOT=y
139   -CONFIG_FASTBOOT_LOCK=y
140   -CONFIG_CMD_BOOTA=y
141   -CONFIG_LIBAVB=y
142   -CONFIG_AVB_SUPPORT=y
143 135 CONFIG_APPEND_BOOTARGS=y
144 136 CONFIG_DUAL_BOOTLOADER=y
145   -CONFIG_SPL_MMC_WRITE=y
146 137 CONFIG_AVB_WARNING_LOGO=y
147 138 CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
148 139 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
149 140 CONFIG_VIRTUAL_AB_SUPPORT=y
  141 +CONFIG_ANDROID_SUPPORT=y
  142 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mq_evk_android_trusty_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
33 33  
34 34  
35 35  
36 36  
... ... @@ -131,24 +131,13 @@
131 131 CONFIG_SYS_WHITE_ON_BLACK=y
132 132  
133 133 CONFIG_LZ4=y
134   -CONFIG_BCB_SUPPORT=y
135   -CONFIG_ANDROID_RECOVERY=y
136   -CONFIG_SUPPORT_RAW_INITRD=y
137 134 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
138   -CONFIG_FSL_FASTBOOT=y
139   -CONFIG_FASTBOOT_LOCK=y
140   -CONFIG_CMD_BOOTA=y
141   -CONFIG_LIBAVB=y
142   -CONFIG_AVB_SUPPORT=y
143 135 CONFIG_APPEND_BOOTARGS=y
144   -CONFIG_CMD_MMC_RPMB=y
145   -CONFIG_SUPPORT_EMMC_RPMB=y
146 136 CONFIG_IMX_TRUSTY_OS=y
147   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
148 137 CONFIG_AVB_WARNING_LOGO=y
149 138 CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
150 139 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
151 140 CONFIG_VIRTUAL_AB_SUPPORT=y
152   -CONFIG_LOAD_KEY_FROM_RPMB=y
153   -CONFIG_ID_ATTESTATION=y
  141 +CONFIG_ANDROID_SUPPORT=y
  142 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mq_evk_android_trusty_dual_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
33 33  
34 34  
35 35  
36 36  
... ... @@ -131,26 +131,14 @@
131 131 CONFIG_SYS_WHITE_ON_BLACK=y
132 132  
133 133 CONFIG_LZ4=y
134   -CONFIG_BCB_SUPPORT=y
135   -CONFIG_ANDROID_RECOVERY=y
136   -CONFIG_SUPPORT_RAW_INITRD=y
137 134 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
138   -CONFIG_FSL_FASTBOOT=y
139   -CONFIG_FASTBOOT_LOCK=y
140   -CONFIG_CMD_BOOTA=y
141   -CONFIG_LIBAVB=y
142   -CONFIG_AVB_SUPPORT=y
143 135 CONFIG_APPEND_BOOTARGS=y
144 136 CONFIG_DUAL_BOOTLOADER=y
145   -CONFIG_SPL_MMC_WRITE=y
146   -CONFIG_CMD_MMC_RPMB=y
147   -CONFIG_SUPPORT_EMMC_RPMB=y
148 137 CONFIG_IMX_TRUSTY_OS=y
149   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
150 138 CONFIG_AVB_WARNING_LOGO=y
151 139 CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
152 140 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
153 141 CONFIG_VIRTUAL_AB_SUPPORT=y
154   -CONFIG_LOAD_KEY_FROM_RPMB=y
155   -CONFIG_ID_ATTESTATION=y
  142 +CONFIG_ANDROID_SUPPORT=y
  143 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mq_evk_android_trusty_secure_unlock_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
33 33  
34 34  
35 35  
36 36  
... ... @@ -131,26 +131,15 @@
131 131 CONFIG_SYS_WHITE_ON_BLACK=y
132 132  
133 133 CONFIG_LZ4=y
134   -CONFIG_BCB_SUPPORT=y
135   -CONFIG_ANDROID_RECOVERY=y
136   -CONFIG_SUPPORT_RAW_INITRD=y
137 134 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
138   -CONFIG_FSL_FASTBOOT=y
139   -CONFIG_FASTBOOT_LOCK=y
140   -CONFIG_CMD_BOOTA=y
141   -CONFIG_LIBAVB=y
142   -CONFIG_AVB_SUPPORT=y
143 135 CONFIG_APPEND_BOOTARGS=y
144   -CONFIG_CMD_MMC_RPMB=y
145   -CONFIG_SUPPORT_EMMC_RPMB=y
146 136 CONFIG_IMX_TRUSTY_OS=y
147   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
148 137 CONFIG_SECURE_UNLOCK=y
149 138 CONFIG_IMX_HAB=y
150 139 CONFIG_AVB_WARNING_LOGO=y
151 140 CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
152 141 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
153 142 CONFIG_VIRTUAL_AB_SUPPORT=y
154   -CONFIG_LOAD_KEY_FROM_RPMB=y
155   -CONFIG_ID_ATTESTATION=y
  143 +CONFIG_ANDROID_SUPPORT=y
  144 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8mq_evk_android_uuu_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL_LOAD_FIT=y
27 27 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg, ANDROID_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
30 30 CONFIG_BOARD_LATE_INIT=y
31 31 CONFIG_BOARD_EARLY_INIT_F=y
32 32 CONFIG_SPL_BOARD_INIT=y
... ... @@ -126,8 +126,7 @@
126 126 CONFIG_USB_DWC3_GADGET=y
127 127  
128 128 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
129   -CONFIG_FSL_FASTBOOT=y
130   -CONFIG_FASTBOOT_LOCK=y
131   -CONFIG_LIBAVB=y
132   -CONFIG_AVB_SUPPORT=y
  129 +CONFIG_ANDROID_SUPPORT=y
  130 +CONFIG_ANDROID_AB_SUPPORT=y
  131 +CONFIG_CMD_BOOTA=n
configs/imx8qm_mek_android_defconfig
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_PANIC_HANG=y
26 26 CONFIG_SPL_TEXT_BASE=0x100000
27 27 CONFIG_OF_SYSTEM_SETUP=y
28   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg, ANDROID_SUPPORT"
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg"
29 29 CONFIG_BOOTDELAY=1
30 30 CONFIG_LOG=y
31 31 CONFIG_SPL_BOARD_INIT=y
32 32  
... ... @@ -173,18 +173,12 @@
173 173 CONFIG_SYS_WHITE_ON_BLACK=y
174 174  
175 175 CONFIG_LZ4=y
176   -CONFIG_BCB_SUPPORT=y
177   -CONFIG_ANDROID_RECOVERY=y
178   -CONFIG_SUPPORT_RAW_INITRD=y
179   -CONFIG_FSL_FASTBOOT=y
180   -CONFIG_FASTBOOT_LOCK=y
181   -CONFIG_CMD_BOOTA=y
182   -CONFIG_LIBAVB=y
183   -CONFIG_AVB_SUPPORT=y
184 176 CONFIG_APPEND_BOOTARGS=y
185 177 CONFIG_AVB_WARNING_LOGO=y
186 178 CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
187 179 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
188 180 CONFIG_PSCI_BOARD_REBOOT=y
189 181 CONFIG_VIRTUAL_AB_SUPPORT=y
  182 +CONFIG_ANDROID_SUPPORT=y
  183 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8qm_mek_android_hdmi_defconfig
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_PANIC_HANG=y
26 26 CONFIG_SPL_TEXT_BASE=0x100000
27 27 CONFIG_OF_SYSTEM_SETUP=y
28   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg, ANDROID_SUPPORT"
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg"
29 29 CONFIG_BOOTDELAY=1
30 30 CONFIG_LOG=y
31 31 CONFIG_SPL_BOARD_INIT=y
... ... @@ -173,14 +173,6 @@
173 173 CONFIG_SYS_WHITE_ON_BLACK=y
174 174  
175 175 CONFIG_LZ4=y
176   -CONFIG_BCB_SUPPORT=y
177   -CONFIG_ANDROID_RECOVERY=y
178   -CONFIG_SUPPORT_RAW_INITRD=y
179   -CONFIG_FSL_FASTBOOT=y
180   -CONFIG_FASTBOOT_LOCK=y
181   -CONFIG_CMD_BOOTA=y
182   -CONFIG_LIBAVB=y
183   -CONFIG_AVB_SUPPORT=y
184 176 CONFIG_APPEND_BOOTARGS=y
185 177 CONFIG_IMX_LOAD_HDMI_FIMRWARE_TX=y
186 178 CONFIG_IMX_LOAD_HDMI_FIMRWARE_RX=y
... ... @@ -189,4 +181,6 @@
189 181 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
190 182 CONFIG_PSCI_BOARD_REBOOT=y
191 183 CONFIG_VIRTUAL_AB_SUPPORT=y
  184 +CONFIG_ANDROID_SUPPORT=y
  185 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8qm_mek_android_trusty_defconfig
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_PANIC_HANG=y
26 26 CONFIG_SPL_TEXT_BASE=0x100000
27 27 CONFIG_OF_SYSTEM_SETUP=y
28   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg, ANDROID_SUPPORT"
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg"
29 29 CONFIG_BOOTDELAY=1
30 30 CONFIG_LOG=y
31 31 CONFIG_SPL_BOARD_INIT=y
32 32  
33 33  
34 34  
... ... @@ -173,25 +173,14 @@
173 173 CONFIG_SYS_WHITE_ON_BLACK=y
174 174  
175 175 CONFIG_LZ4=y
176   -CONFIG_BCB_SUPPORT=y
177   -CONFIG_ANDROID_RECOVERY=y
178   -CONFIG_SUPPORT_RAW_INITRD=y
179   -CONFIG_FSL_FASTBOOT=y
180   -CONFIG_FASTBOOT_LOCK=y
181   -CONFIG_CMD_BOOTA=y
182   -CONFIG_LIBAVB=y
183   -CONFIG_AVB_SUPPORT=y
184 176 CONFIG_APPEND_BOOTARGS=y
185 177 CONFIG_SHA256=y
186   -CONFIG_CMD_MMC_RPMB=y
187   -CONFIG_SUPPORT_EMMC_RPMB=y
188 178 CONFIG_IMX_TRUSTY_OS=y
189   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
190 179 CONFIG_AVB_WARNING_LOGO=y
191 180 CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
192 181 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
193 182 CONFIG_PSCI_BOARD_REBOOT=y
194 183 CONFIG_VIRTUAL_AB_SUPPORT=y
195   -CONFIG_LOAD_KEY_FROM_RPMB=y
196   -CONFIG_ID_ATTESTATION=y
  184 +CONFIG_ANDROID_SUPPORT=y
  185 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8qm_mek_android_trusty_secure_unlock_defconfig
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_PANIC_HANG=y
26 26 CONFIG_SPL_TEXT_BASE=0x100000
27 27 CONFIG_OF_SYSTEM_SETUP=y
28   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg, ANDROID_SUPPORT"
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg"
29 29 CONFIG_BOOTDELAY=1
30 30 CONFIG_LOG=y
31 31 CONFIG_SPL_BOARD_INIT=y
32 32  
33 33  
... ... @@ -173,20 +173,9 @@
173 173 CONFIG_SYS_WHITE_ON_BLACK=y
174 174  
175 175 CONFIG_LZ4=y
176   -CONFIG_BCB_SUPPORT=y
177   -CONFIG_ANDROID_RECOVERY=y
178   -CONFIG_SUPPORT_RAW_INITRD=y
179   -CONFIG_FSL_FASTBOOT=y
180   -CONFIG_FASTBOOT_LOCK=y
181   -CONFIG_CMD_BOOTA=y
182   -CONFIG_LIBAVB=y
183   -CONFIG_AVB_SUPPORT=y
184 176 CONFIG_APPEND_BOOTARGS=y
185 177 CONFIG_SHA256=y
186   -CONFIG_CMD_MMC_RPMB=y
187   -CONFIG_SUPPORT_EMMC_RPMB=y
188 178 CONFIG_IMX_TRUSTY_OS=y
189   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
190 179 CONFIG_SECURE_UNLOCK=y
191 180 CONFIG_AHAB_BOOT=y
192 181 CONFIG_AVB_WARNING_LOGO=y
... ... @@ -194,6 +183,6 @@
194 183 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
195 184 CONFIG_PSCI_BOARD_REBOOT=y
196 185 CONFIG_VIRTUAL_AB_SUPPORT=y
197   -CONFIG_LOAD_KEY_FROM_RPMB=y
198   -CONFIG_ID_ATTESTATION=y
  186 +CONFIG_ANDROID_SUPPORT=y
  187 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8qm_mek_android_uuu_defconfig
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_PANIC_HANG=y
26 26 CONFIG_SPL_TEXT_BASE=0x100000
27 27 CONFIG_OF_SYSTEM_SETUP=y
28   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg, ANDROID_SUPPORT"
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg"
29 29 CONFIG_BOOTDELAY=1
30 30 CONFIG_LOG=y
31 31 CONFIG_SPL_BOARD_INIT=y
... ... @@ -166,8 +166,7 @@
166 166  
167 167 CONFIG_VIDEO_IMX_HDP_LOAD=y
168 168  
169   -CONFIG_FSL_FASTBOOT=y
170   -CONFIG_FASTBOOT_LOCK=y
171   -CONFIG_LIBAVB=y
172   -CONFIG_AVB_SUPPORT=y
  169 +CONFIG_ANDROID_SUPPORT=y
  170 +CONFIG_ANDROID_AB_SUPPORT=y
  171 +CONFIG_CMD_BOOTA=n
configs/imx8qm_mek_androidauto2_trusty_defconfig
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_PANIC_HANG=y
26 26 CONFIG_SPL_TEXT_BASE=0x100000
27 27 CONFIG_OF_SYSTEM_SETUP=y
28   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg,ANDROID_AUTO_SUPPORT"
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg"
29 29 CONFIG_BOOTDELAY=1
30 30 CONFIG_LOG=y
31 31 CONFIG_SPL_BOARD_INIT=y
32 32  
33 33  
34 34  
... ... @@ -158,24 +158,13 @@
158 158 # CONFIG_CMD_BLOCK_CACHE is not set
159 159  
160 160 CONFIG_LZ4=y
161   -CONFIG_BCB_SUPPORT=y
162   -CONFIG_ANDROID_RECOVERY=y
163   -CONFIG_SUPPORT_RAW_INITRD=y
164   -CONFIG_FSL_FASTBOOT=y
165   -CONFIG_FASTBOOT_LOCK=y
166   -CONFIG_CMD_BOOTA=y
167   -CONFIG_LIBAVB=y
168   -CONFIG_AVB_SUPPORT=y
169 161 CONFIG_APPEND_BOOTARGS=y
170 162 CONFIG_SHA256=y
171   -CONFIG_CMD_MMC_RPMB=y
172   -CONFIG_SUPPORT_EMMC_RPMB=y
173 163 CONFIG_IMX_TRUSTY_OS=y
174   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
175   -CONFIG_SPL_MMC_WRITE=y
176   -CONFIG_SPL_LIBDISK_SUPPORT=y
177 164 CONFIG_PSCI_BOARD_REBOOT=y
178 165 CONFIG_VIRTUAL_AB_SUPPORT=y
179 166 CONFIG_ATTESTATION_ID_PRODUCT="mek_8q_car2"
180   -CONFIG_ID_ATTESTATION=y
  167 +CONFIG_ANDROID_AUTO_SUPPORT=y
  168 +CONFIG_ANDROID_AB_SUPPORT=y
  169 +CONFIG_LOAD_KEY_FROM_RPMB=n
configs/imx8qm_mek_androidauto2_trusty_md_defconfig
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_PANIC_HANG=y
26 26 CONFIG_SPL_TEXT_BASE=0x100000
27 27 CONFIG_OF_SYSTEM_SETUP=y
28   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg,ANDROID_AUTO_SUPPORT"
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg"
29 29 CONFIG_BOOTDELAY=1
30 30 CONFIG_LOG=y
31 31 CONFIG_SPL_BOARD_INIT=y
32 32  
33 33  
34 34  
... ... @@ -160,25 +160,14 @@
160 160 # CONFIG_CMD_BLOCK_CACHE is not set
161 161  
162 162 CONFIG_LZ4=y
163   -CONFIG_BCB_SUPPORT=y
164   -CONFIG_ANDROID_RECOVERY=y
165   -CONFIG_SUPPORT_RAW_INITRD=y
166   -CONFIG_FSL_FASTBOOT=y
167   -CONFIG_FASTBOOT_LOCK=y
168   -CONFIG_CMD_BOOTA=y
169   -CONFIG_LIBAVB=y
170   -CONFIG_AVB_SUPPORT=y
171 163 CONFIG_APPEND_BOOTARGS=y
172 164 CONFIG_SHA256=y
173   -CONFIG_CMD_MMC_RPMB=y
174   -CONFIG_SUPPORT_EMMC_RPMB=y
175 165 CONFIG_IMX_TRUSTY_OS=y
176   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
177   -CONFIG_SPL_MMC_WRITE=y
178   -CONFIG_SPL_LIBDISK_SUPPORT=y
179 166 CONFIG_IMX_LOAD_HDMI_FIMRWARE_TX=y
180 167 CONFIG_PSCI_BOARD_REBOOT=y
181 168 CONFIG_VIRTUAL_AB_SUPPORT=y
182 169 CONFIG_ATTESTATION_ID_PRODUCT="mek_8q_car2"
183   -CONFIG_ID_ATTESTATION=y
  170 +CONFIG_ANDROID_AUTO_SUPPORT=y
  171 +CONFIG_ANDROID_AB_SUPPORT=y
  172 +CONFIG_LOAD_KEY_FROM_RPMB=n
configs/imx8qm_mek_androidauto_trusty_defconfig
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_PANIC_HANG=y
26 26 CONFIG_SPL_TEXT_BASE=0x100000
27 27 CONFIG_OF_SYSTEM_SETUP=y
28   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg,ANDROID_AUTO_SUPPORT"
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg"
29 29 CONFIG_BOOTDELAY=1
30 30 CONFIG_LOG=y
31 31 CONFIG_SPL_BOARD_INIT=y
32 32  
33 33  
34 34  
35 35  
36 36  
... ... @@ -158,25 +158,12 @@
158 158 # CONFIG_CMD_BLOCK_CACHE is not set
159 159  
160 160 CONFIG_LZ4=y
161   -CONFIG_BCB_SUPPORT=y
162   -CONFIG_ANDROID_RECOVERY=y
163   -CONFIG_SUPPORT_RAW_INITRD=y
164   -CONFIG_FSL_FASTBOOT=y
165   -CONFIG_FASTBOOT_LOCK=y
166   -CONFIG_CMD_BOOTA=y
167   -CONFIG_LIBAVB=y
168   -CONFIG_AVB_SUPPORT=y
169 161 CONFIG_APPEND_BOOTARGS=y
170 162 CONFIG_SHA256=y
171   -CONFIG_CMD_MMC_RPMB=y
172   -CONFIG_SUPPORT_EMMC_RPMB=y
173 163 CONFIG_IMX_TRUSTY_OS=y
174   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
175 164 CONFIG_DUAL_BOOTLOADER=y
176   -CONFIG_SPL_MMC_WRITE=y
177   -CONFIG_SPL_LIBDISK_SUPPORT=y
178 165 CONFIG_PSCI_BOARD_REBOOT=y
179   -CONFIG_LOAD_KEY_FROM_RPMB=y
180 166 CONFIG_ATTESTATION_ID_PRODUCT="mek_8q_car"
181   -CONFIG_ID_ATTESTATION=y
  167 +CONFIG_ANDROID_AUTO_SUPPORT=y
  168 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_PANIC_HANG=y
26 26 CONFIG_SPL_TEXT_BASE=0x100000
27 27 CONFIG_OF_SYSTEM_SETUP=y
28   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg,ANDROID_AUTO_SUPPORT"
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg"
29 29 CONFIG_BOOTDELAY=1
30 30 CONFIG_LOG=y
31 31 CONFIG_SPL_BOARD_INIT=y
32 32  
33 33  
34 34  
35 35  
36 36  
... ... @@ -158,27 +158,14 @@
158 158 # CONFIG_CMD_BLOCK_CACHE is not set
159 159  
160 160 CONFIG_LZ4=y
161   -CONFIG_BCB_SUPPORT=y
162   -CONFIG_ANDROID_RECOVERY=y
163   -CONFIG_SUPPORT_RAW_INITRD=y
164   -CONFIG_FSL_FASTBOOT=y
165   -CONFIG_FASTBOOT_LOCK=y
166   -CONFIG_CMD_BOOTA=y
167   -CONFIG_LIBAVB=y
168   -CONFIG_AVB_SUPPORT=y
169 161 CONFIG_APPEND_BOOTARGS=y
170 162 CONFIG_SHA256=y
171   -CONFIG_CMD_MMC_RPMB=y
172   -CONFIG_SUPPORT_EMMC_RPMB=y
173 163 CONFIG_IMX_TRUSTY_OS=y
174   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
175 164 CONFIG_DUAL_BOOTLOADER=y
176   -CONFIG_SPL_MMC_WRITE=y
177   -CONFIG_SPL_LIBDISK_SUPPORT=y
178 165 CONFIG_SECURE_UNLOCK=y
179 166 CONFIG_AHAB_BOOT=y
180 167 CONFIG_PSCI_BOARD_REBOOT=y
181   -CONFIG_LOAD_KEY_FROM_RPMB=y
182 168 CONFIG_ATTESTATION_ID_PRODUCT="mek_8q_car"
183   -CONFIG_ID_ATTESTATION=y
  169 +CONFIG_ANDROID_AUTO_SUPPORT=y
  170 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8qm_mek_androidauto_xen_defconfig
... ... @@ -26,7 +26,7 @@
26 26 CONFIG_SPL=y
27 27 CONFIG_PANIC_HANG=y
28 28 CONFIG_OF_SYSTEM_SETUP=y
29   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg,ANDROID_AUTO_SUPPORT"
  29 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg"
30 30 CONFIG_DEBUG_UART=y
31 31 CONFIG_DEBUG_UART_XEN=y
32 32 CONFIG_BOOTDELAY=1
33 33  
34 34  
35 35  
36 36  
... ... @@ -180,26 +180,15 @@
180 180 # CONFIG_CMD_BLOCK_CACHE is not set
181 181  
182 182 CONFIG_LZ4=y
183   -CONFIG_BCB_SUPPORT=y
184   -CONFIG_ANDROID_RECOVERY=y
185   -CONFIG_SUPPORT_RAW_INITRD=y
186   -CONFIG_FSL_FASTBOOT=y
187   -CONFIG_FASTBOOT_LOCK=y
188   -CONFIG_CMD_BOOTA=y
189   -CONFIG_LIBAVB=y
190   -CONFIG_AVB_SUPPORT=y
191 183 CONFIG_APPEND_BOOTARGS=y
192 184 CONFIG_SHA256=y
193   -CONFIG_CMD_MMC_RPMB=y
194   -CONFIG_SUPPORT_EMMC_RPMB=y
195 185 CONFIG_IMX_TRUSTY_OS=y
196   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
197 186 CONFIG_DUAL_BOOTLOADER=y
198   -CONFIG_SPL_MMC_WRITE=y
199   -CONFIG_SPL_LIBDISK_SUPPORT=y
200 187 CONFIG_XEN=y
201 188 CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y
202 189 CONFIG_XEN_DEBUG_SERIAL=y
203 190 CONFIG_LOAD_KEY_FROM_RPMB=y
204 191 CONFIG_VIRTUAL_AB_SUPPORT=y
  192 +CONFIG_ANDROID_AUTO_SUPPORT=y
  193 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8qxp_mek_android_defconfig
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_PANIC_HANG=y
26 26 CONFIG_SPL_TEXT_BASE=0x100000
27 27 CONFIG_OF_SYSTEM_SETUP=y
28   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg, ANDROID_SUPPORT"
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg"
29 29 CONFIG_BOOTDELAY=1
30 30 CONFIG_LOG=y
31 31 CONFIG_SPL_BOARD_INIT=y
32 32  
... ... @@ -174,18 +174,12 @@
174 174 CONFIG_SYS_WHITE_ON_BLACK=y
175 175  
176 176 CONFIG_LZ4=y
177   -CONFIG_BCB_SUPPORT=y
178   -CONFIG_ANDROID_RECOVERY=y
179   -CONFIG_SUPPORT_RAW_INITRD=y
180   -CONFIG_FSL_FASTBOOT=y
181   -CONFIG_FASTBOOT_LOCK=y
182   -CONFIG_CMD_BOOTA=y
183   -CONFIG_LIBAVB=y
184   -CONFIG_AVB_SUPPORT=y
185 177 CONFIG_APPEND_BOOTARGS=y
186 178 CONFIG_AVB_WARNING_LOGO=y
187 179 CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
188 180 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
189 181 CONFIG_PSCI_BOARD_REBOOT=y
190 182 CONFIG_VIRTUAL_AB_SUPPORT=y
  183 +CONFIG_ANDROID_SUPPORT=y
  184 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8qxp_mek_android_trusty_defconfig
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_PANIC_HANG=y
26 26 CONFIG_SPL_TEXT_BASE=0x100000
27 27 CONFIG_OF_SYSTEM_SETUP=y
28   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg, ANDROID_SUPPORT"
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg"
29 29 CONFIG_BOOTDELAY=1
30 30 CONFIG_LOG=y
31 31 CONFIG_SPL_BOARD_INIT=y
32 32  
33 33  
34 34  
... ... @@ -174,25 +174,14 @@
174 174 CONFIG_SYS_WHITE_ON_BLACK=y
175 175  
176 176 CONFIG_LZ4=y
177   -CONFIG_BCB_SUPPORT=y
178   -CONFIG_ANDROID_RECOVERY=y
179   -CONFIG_SUPPORT_RAW_INITRD=y
180   -CONFIG_FSL_FASTBOOT=y
181   -CONFIG_FASTBOOT_LOCK=y
182   -CONFIG_CMD_BOOTA=y
183   -CONFIG_LIBAVB=y
184   -CONFIG_AVB_SUPPORT=y
185 177 CONFIG_APPEND_BOOTARGS=y
186 178 CONFIG_SHA256=y
187   -CONFIG_CMD_MMC_RPMB=y
188   -CONFIG_SUPPORT_EMMC_RPMB=y
189 179 CONFIG_IMX_TRUSTY_OS=y
190   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
191 180 CONFIG_AVB_WARNING_LOGO=y
192 181 CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
193 182 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
194 183 CONFIG_PSCI_BOARD_REBOOT=y
195 184 CONFIG_VIRTUAL_AB_SUPPORT=y
196   -CONFIG_LOAD_KEY_FROM_RPMB=y
197   -CONFIG_ID_ATTESTATION=y
  185 +CONFIG_ANDROID_SUPPORT=y
  186 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8qxp_mek_android_trusty_secure_unlock_defconfig
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_PANIC_HANG=y
26 26 CONFIG_SPL_TEXT_BASE=0x100000
27 27 CONFIG_OF_SYSTEM_SETUP=y
28   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg, ANDROID_SUPPORT"
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg"
29 29 CONFIG_BOOTDELAY=1
30 30 CONFIG_LOG=y
31 31 CONFIG_SPL_BOARD_INIT=y
32 32  
33 33  
... ... @@ -174,20 +174,9 @@
174 174 CONFIG_SYS_WHITE_ON_BLACK=y
175 175  
176 176 CONFIG_LZ4=y
177   -CONFIG_BCB_SUPPORT=y
178   -CONFIG_ANDROID_RECOVERY=y
179   -CONFIG_SUPPORT_RAW_INITRD=y
180   -CONFIG_FSL_FASTBOOT=y
181   -CONFIG_FASTBOOT_LOCK=y
182   -CONFIG_CMD_BOOTA=y
183   -CONFIG_LIBAVB=y
184   -CONFIG_AVB_SUPPORT=y
185 177 CONFIG_APPEND_BOOTARGS=y
186 178 CONFIG_SHA256=y
187   -CONFIG_CMD_MMC_RPMB=y
188   -CONFIG_SUPPORT_EMMC_RPMB=y
189 179 CONFIG_IMX_TRUSTY_OS=y
190   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
191 180 CONFIG_SECURE_UNLOCK=y
192 181 CONFIG_AHAB_BOOT=y
193 182 CONFIG_AVB_WARNING_LOGO=y
... ... @@ -195,6 +184,6 @@
195 184 CONFIG_AVB_WARNING_LOGO_ROWS=0x60
196 185 CONFIG_PSCI_BOARD_REBOOT=y
197 186 CONFIG_VIRTUAL_AB_SUPPORT=y
198   -CONFIG_LOAD_KEY_FROM_RPMB=y
199   -CONFIG_ID_ATTESTATION=y
  187 +CONFIG_ANDROID_SUPPORT=y
  188 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8qxp_mek_android_uuu_defconfig
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_PANIC_HANG=y
26 26 CONFIG_SPL_TEXT_BASE=0x100000
27 27 CONFIG_OF_SYSTEM_SETUP=y
28   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg, ANDROID_SUPPORT"
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg"
29 29 CONFIG_BOOTDELAY=1
30 30 CONFIG_LOG=y
31 31 CONFIG_SPL_BOARD_INIT=y
... ... @@ -167,8 +167,7 @@
167 167  
168 168 CONFIG_SNVS_SEC_SC=y
169 169  
170   -CONFIG_FSL_FASTBOOT=y
171   -CONFIG_FASTBOOT_LOCK=y
172   -CONFIG_LIBAVB=y
173   -CONFIG_AVB_SUPPORT=y
  170 +CONFIG_ANDROID_SUPPORT=y
  171 +CONFIG_ANDROID_AB_SUPPORT=y
  172 +CONFIG_CMD_BOOTA=n
configs/imx8qxp_mek_androidauto2_trusty_defconfig
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_PANIC_HANG=y
26 26 CONFIG_SPL_TEXT_BASE=0x100000
27 27 CONFIG_OF_SYSTEM_SETUP=y
28   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg, ANDROID_AUTO_SUPPORT"
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg"
29 29 CONFIG_BOOTDELAY=1
30 30 CONFIG_LOG=y
31 31 CONFIG_SPL_BOARD_INIT=y
32 32  
33 33  
34 34  
... ... @@ -168,24 +168,13 @@
168 168 # CONFIG_CMD_BLOCK_CACHE is not set
169 169  
170 170 CONFIG_LZ4=y
171   -CONFIG_BCB_SUPPORT=y
172   -CONFIG_ANDROID_RECOVERY=y
173   -CONFIG_SUPPORT_RAW_INITRD=y
174   -CONFIG_FSL_FASTBOOT=y
175   -CONFIG_FASTBOOT_LOCK=y
176   -CONFIG_CMD_BOOTA=y
177   -CONFIG_LIBAVB=y
178   -CONFIG_AVB_SUPPORT=y
179 171 CONFIG_APPEND_BOOTARGS=y
180 172 CONFIG_SHA256=y
181   -CONFIG_CMD_MMC_RPMB=y
182   -CONFIG_SUPPORT_EMMC_RPMB=y
183 173 CONFIG_IMX_TRUSTY_OS=y
184   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
185   -CONFIG_SPL_MMC_WRITE=y
186   -CONFIG_SPL_LIBDISK_SUPPORT=y
187 174 CONFIG_PSCI_BOARD_REBOOT=y
188 175 CONFIG_VIRTUAL_AB_SUPPORT=y
189 176 CONFIG_ATTESTATION_ID_PRODUCT="mek_8q_car2"
190   -CONFIG_ID_ATTESTATION=y
  177 +CONFIG_ANDROID_AUTO_SUPPORT=y
  178 +CONFIG_ANDROID_AB_SUPPORT=y
  179 +CONFIG_LOAD_KEY_FROM_RPMB=n
configs/imx8qxp_mek_androidauto_trusty_defconfig
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_PANIC_HANG=y
26 26 CONFIG_SPL_TEXT_BASE=0x100000
27 27 CONFIG_OF_SYSTEM_SETUP=y
28   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg, ANDROID_AUTO_SUPPORT"
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg"
29 29 CONFIG_BOOTDELAY=1
30 30 CONFIG_LOG=y
31 31 CONFIG_SPL_BOARD_INIT=y
32 32  
33 33  
34 34  
35 35  
... ... @@ -169,25 +169,13 @@
169 169 # CONFIG_CMD_BLOCK_CACHE is not set
170 170  
171 171 CONFIG_LZ4=y
172   -CONFIG_BCB_SUPPORT=y
173   -CONFIG_ANDROID_RECOVERY=y
174   -CONFIG_SUPPORT_RAW_INITRD=y
175   -CONFIG_FSL_FASTBOOT=y
176   -CONFIG_FASTBOOT_LOCK=y
177   -CONFIG_CMD_BOOTA=y
178   -CONFIG_LIBAVB=y
179   -CONFIG_AVB_SUPPORT=y
180 172 CONFIG_APPEND_BOOTARGS=y
181 173 CONFIG_SHA256=y
182   -CONFIG_CMD_MMC_RPMB=y
183   -CONFIG_SUPPORT_EMMC_RPMB=y
184 174 CONFIG_IMX_TRUSTY_OS=y
185   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
186 175 CONFIG_DUAL_BOOTLOADER=y
187   -CONFIG_SPL_MMC_WRITE=y
188   -CONFIG_SPL_LIBDISK_SUPPORT=y
189 176 CONFIG_PSCI_BOARD_REBOOT=y
190 177 CONFIG_LOAD_KEY_FROM_RPMB=y
191 178 CONFIG_ATTESTATION_ID_PRODUCT="mek_8q_car"
192   -CONFIG_ID_ATTESTATION=y
  179 +CONFIG_ANDROID_AUTO_SUPPORT=y
  180 +CONFIG_ANDROID_AB_SUPPORT=y
configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_PANIC_HANG=y
26 26 CONFIG_SPL_TEXT_BASE=0x100000
27 27 CONFIG_OF_SYSTEM_SETUP=y
28   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg, ANDROID_AUTO_SUPPORT"
  28 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg"
29 29 CONFIG_BOOTDELAY=1
30 30 CONFIG_LOG=y
31 31 CONFIG_SPL_BOARD_INIT=y
32 32  
33 33  
34 34  
35 35  
36 36  
... ... @@ -169,27 +169,14 @@
169 169 # CONFIG_CMD_BLOCK_CACHE is not set
170 170  
171 171 CONFIG_LZ4=y
172   -CONFIG_BCB_SUPPORT=y
173   -CONFIG_ANDROID_RECOVERY=y
174   -CONFIG_SUPPORT_RAW_INITRD=y
175   -CONFIG_FSL_FASTBOOT=y
176   -CONFIG_FASTBOOT_LOCK=y
177   -CONFIG_CMD_BOOTA=y
178   -CONFIG_LIBAVB=y
179   -CONFIG_AVB_SUPPORT=y
180 172 CONFIG_APPEND_BOOTARGS=y
181 173 CONFIG_SHA256=y
182   -CONFIG_CMD_MMC_RPMB=y
183   -CONFIG_SUPPORT_EMMC_RPMB=y
184 174 CONFIG_IMX_TRUSTY_OS=y
185   -CONFIG_TRUSTY_UNLOCK_PERMISSION=y
186 175 CONFIG_DUAL_BOOTLOADER=y
187   -CONFIG_SPL_MMC_WRITE=y
188   -CONFIG_SPL_LIBDISK_SUPPORT=y
189 176 CONFIG_SECURE_UNLOCK=y
190 177 CONFIG_AHAB_BOOT=y
191 178 CONFIG_PSCI_BOARD_REBOOT=y
192   -CONFIG_LOAD_KEY_FROM_RPMB=y
193 179 CONFIG_ATTESTATION_ID_PRODUCT="mek_8q_car"
194   -CONFIG_ID_ATTESTATION=y
  180 +CONFIG_ANDROID_AUTO_SUPPORT=y
  181 +CONFIG_ANDROID_AB_SUPPORT=y
drivers/fastboot/Kconfig
... ... @@ -99,7 +99,9 @@
99 99  
100 100 config CMD_BOOTA
101 101 bool "Enable the boota command"
  102 + default y
102 103 depends on FSL_FASTBOOT
  104 + depends on ANDROID_SUPPORT || ANDROID_AUTO_SUPPORT || ANDROID_THINGS_SUPPORT
103 105 help
104 106 This enables the boota command for booting android images.
105 107  
drivers/fastboot/fb_fsl/fb_fsl_command.c
... ... @@ -862,7 +862,7 @@
862 862 #if defined(CONFIG_FASTBOOT_LOCK)
863 863 if (strncmp(cmd, "gpt", 3) == 0) {
864 864 int gpt_valid = 0;
865   - int status, mmc_no;
  865 + int mmc_no;
866 866 struct blk_desc *dev_desc;
867 867 mmc_no = fastboot_devinfo.dev_id;
868 868 dev_desc = blk_get_dev("mmc", mmc_no);
include/configs/imx8mm_evk_android.h
... ... @@ -7,10 +7,6 @@
7 7 #ifndef IMX8MM_EVK_ANDROID_H
8 8 #define IMX8MM_EVK_ANDROID_H
9 9  
10   -#define CONFIG_ANDROID_AB_SUPPORT
11   -#ifdef CONFIG_ANDROID_AB_SUPPORT
12   -#define CONFIG_SYSTEM_RAMDISK_SUPPORT
13   -#endif
14 10 #define FSL_FASTBOOT_FB_DEV "mmc"
15 11  
16 12 #ifdef CONFIG_SYS_MALLOC_LEN
... ... @@ -70,8 +66,8 @@
70 66  
71 67 #endif
72 68  
73   -/* Enable CONFIG_ANDROID_LOW_MEMORY to config 1GB ddr */
74   -#ifdef CONFIG_ANDROID_LOW_MEMORY
  69 +/* Enable CONFIG_IMX8M_1G_MEMORY to config 1GB ddr */
  70 +#ifdef CONFIG_IMX8M_1G_MEMORY
75 71 #undef PHYS_SDRAM_SIZE
76 72 #define PHYS_SDRAM_SIZE 0x40000000 /* 1GB DDR */
77 73 #endif
include/configs/imx8mn_evk_android.h
... ... @@ -7,10 +7,6 @@
7 7 #ifndef IMX8MN_EVK_ANDROID_H
8 8 #define IMX8MN_EVK_ANDROID_H
9 9  
10   -#define CONFIG_ANDROID_AB_SUPPORT
11   -#ifdef CONFIG_ANDROID_AB_SUPPORT
12   -#define CONFIG_SYSTEM_RAMDISK_SUPPORT
13   -#endif
14 10 #define FSL_FASTBOOT_FB_DEV "mmc"
15 11  
16 12 #ifdef CONFIG_SYS_MALLOC_LEN
include/configs/imx8mp_evk_android.h
... ... @@ -7,10 +7,6 @@
7 7 #ifndef IMX8MP_EVK_ANDROID_H
8 8 #define IMX8MP_EVK_ANDROID_H
9 9  
10   -#define CONFIG_ANDROID_AB_SUPPORT
11   -#ifdef CONFIG_ANDROID_AB_SUPPORT
12   -#define CONFIG_SYSTEM_RAMDISK_SUPPORT
13   -#endif
14 10 #define FSL_FASTBOOT_FB_DEV "mmc"
15 11  
16 12 #ifdef CONFIG_SYS_MALLOC_LEN
include/configs/imx8mq_evk_android.h
... ... @@ -7,10 +7,6 @@
7 7 #ifndef IMX8MQ_EVK_ANDROID_H
8 8 #define IMX8MQ_EVK_ANDROID_H
9 9  
10   -#define CONFIG_ANDROID_AB_SUPPORT
11   -#ifdef CONFIG_ANDROID_AB_SUPPORT
12   -#define CONFIG_SYSTEM_RAMDISK_SUPPORT
13   -#endif
14 10 #define FSL_FASTBOOT_FB_DEV "mmc"
15 11  
16 12 #ifdef CONFIG_SYS_MALLOC_LEN
include/configs/imx8qm_mek_android.h
... ... @@ -9,10 +9,6 @@
9 9  
10 10 #define CONFIG_USB_GADGET_VBUS_DRAW 2
11 11  
12   -#define CONFIG_ANDROID_AB_SUPPORT
13   -#ifdef CONFIG_ANDROID_AB_SUPPORT
14   -#define CONFIG_SYSTEM_RAMDISK_SUPPORT
15   -#endif
16 12 #define FSL_FASTBOOT_FB_DEV "mmc"
17 13  
18 14 #define IMX_HDMI_FIRMWARE_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_64M)
include/configs/imx8qm_mek_android_auto.h
... ... @@ -17,10 +17,6 @@
17 17 #endif
18 18 #endif
19 19  
20   -#define CONFIG_ANDROID_AB_SUPPORT
21   -#ifdef CONFIG_ANDROID_AB_SUPPORT
22   -#define CONFIG_SYSTEM_RAMDISK_SUPPORT
23   -#endif
24 20 #define FSL_FASTBOOT_FB_DEV "mmc"
25 21  
26 22 #define IMX_HDMI_FIRMWARE_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_64M)
include/configs/imx8qxp_mek_android.h
... ... @@ -9,10 +9,6 @@
9 9  
10 10 #define CONFIG_USB_GADGET_VBUS_DRAW 2
11 11  
12   -#define CONFIG_ANDROID_AB_SUPPORT
13   -#ifdef CONFIG_ANDROID_AB_SUPPORT
14   -#define CONFIG_SYSTEM_RAMDISK_SUPPORT
15   -#endif
16 12 #define FSL_FASTBOOT_FB_DEV "mmc"
17 13  
18 14  
include/configs/imx8qxp_mek_android_auto.h
... ... @@ -17,10 +17,6 @@
17 17 #endif
18 18 #endif
19 19  
20   -#define CONFIG_ANDROID_AB_SUPPORT
21   -#ifdef CONFIG_ANDROID_AB_SUPPORT
22   -#define CONFIG_SYSTEM_RAMDISK_SUPPORT
23   -#endif
24 20 #define FSL_FASTBOOT_FB_DEV "mmc"
25 21  
26 22 #undef CONFIG_EXTRA_ENV_SETTINGS
... ... @@ -357,52 +357,6 @@
357 357 default 0x3
358 358 help
359 359 The time of avb warning logo will last (s).
360   -
361   -config BOOTLOADER_MENU
362   - bool "Enable bootloader menu for android device"
363   - help
364   - bootloader menu feature for android device.
365   -
366   -config APPEND_BOOTARGS
367   - bool "Append bootargs support"
368   -
369   -config DUAL_BOOTLOADER
370   - bool "Enable dual bootloader support"
371   - help
372   - Enable A/B bootloader select in SPL.
373   -
374   -config AT_AUTHENTICATE_UNLOCK
375   - bool "Enable authenticate unlock for Android Things devices"
376   -
377   -config SECURE_UNLOCK
378   - bool "Enable secure unlock for Android devices, it can only be enabled on HAB closed board"
379   -
380   -config TRUSTY_UNLOCK_PERMISSION
381   - bool "Support unlock permission protection in trusty"
382   - depends on IMX_TRUSTY_OS
383   -
384   -config ANDROID_DYNAMIC_PARTITION
385   - bool "Support to boot up Android with system image in logical partitions"
386   -
387   -config VIRTUAL_AB_SUPPORT
388   - bool "Support virtual AB update"
389   - select ANDROID_DYNAMIC_PARTITION
390   -
391   -config LOAD_KEY_FROM_RPMB
392   - bool "Support load AVB public key from RPMB storage"
393   - default n
394   - depends on IMX_TRUSTY_OS
395   -
396   -config ID_ATTESTATION
397   - bool "Support device ID attestation"
398   - default n
399   - depends on IMX_TRUSTY_OS
400   -
401   -config ATTESTATION_ID_PRODUCT
402   - string "Product name for ID attestation"
403   - depends on IMX_TRUSTY_OS && ID_ATTESTATION
404   - default SYS_CONFIG_NAME
405   -
406 360 endmenu
407 361  
408 362 menu "Hashing Support"
scripts/config_whitelist.txt
... ... @@ -30,11 +30,6 @@
30 30 CONFIG_AM437X_USB2PHY2_HOST
31 31 CONFIG_ANDES_PCU
32 32 CONFIG_ANDES_PCU_BASE
33   -CONFIG_ANDROID_AB_SUPPORT
34   -CONFIG_ANDROID_AUTO_SUPPORT
35   -CONFIG_ANDROID_LOW_MEMORY
36   -CONFIG_ANDROID_SUPPORT
37   -CONFIG_ANDROID_THINGS_SUPPORT
38 33 CONFIG_APER_0_BASE
39 34 CONFIG_APER_1_BASE
40 35 CONFIG_APER_SIZE
... ... @@ -1792,7 +1787,6 @@
1792 1787 CONFIG_SYSFLAGS_ADDR
1793 1788 CONFIG_SYSFS
1794 1789 CONFIG_SYSMGR_ISWGRP_HANDOFF
1795   -CONFIG_SYSTEM_RAMDISK_SUPPORT
1796 1790 CONFIG_SYS_33MHZ
1797 1791 CONFIG_SYS_64BIT
1798 1792 CONFIG_SYS_64BIT_LBA