Eric Lee / smarc-uboot

1
Download as
Browse Code ยป

Commit 8f3e86b52a27948ba1be1d93dae5e5a4c8a73a0a

Authored by Ji Luo
Committed by Ye Li
1 parent ebae18a52c
Exists in smarc_8mq_lf_v2020.04 and in 4 other branches pitx_8mp_lf_v2020.04, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mp_lf_v2020.04

MA-18634-1 Android: refine config dependency 

Refine the dependency of some configs to make it
easier to add/modify android config files.

Test: builds.

Change-Id: Iccb044dadc7ce1e0b839bf83e2e9157e718f286c
Signed-off-by: Ji Luo <ji.luo@nxp.com>
(cherry picked from commit 86f4f99a367bbc0ef99d4ab2a0b4078babfbfbd2)

Showing 5 changed files with 104 additions and 52 deletions Side-by-side Diff

arch/arm/mach-imx/Kconfig
Diff comments   View file @ 8f3e86b
... ... @@ -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
Diff comments   View file @ 8f3e86b
... ... @@ -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
drivers/fastboot/Kconfig
Diff comments   View file @ 8f3e86b
... ... @@ -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  
... ... @@ -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
Diff comments   View file @ 8f3e86b
... ... @@ -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