diff options
| author | faqiang.zhu <faqiang.zhu@nxp.com> | 2020-10-21 16:14:38 +0800 |
|---|---|---|
| committer | faqiang.zhu <faqiang.zhu@nxp.com> | 2020-10-23 11:05:45 +0800 |
| commit | 972ccff86796e2b7f9a444d09550cd5e393cd93e (patch) | |
| tree | 93f67e402a2b0fa5c856c0160aad53f010c707f4 /lib | |
| parent | f0f496abb5d7bef031603d1c3ab5387facead209 (diff) | |
MA-17519-4 boot up car2 with recovery ramdisk
To use dynamic partition feature in Android, recovery ramdisk is used to
mount the logical partitions and boot up Android.
Define a configuration item "CONFIG_ANDROID_DYNAMIC_PARTITION", use it
to control the bootargs and whether ramdisk should be loaded instead of
"CONFIG_ANDROID_AUTO" because now Android auto also use dynamic
partition feature now.
Move the definition of function "fastboot_setup_system_boot_args" under
the macro "CONFIG_CMD_BOOTA" to avoid build warnings.
Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com>
Change-Id: I0b1cfe6120fc939e7f1a1eb600d8176c81edf129
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig | 4 | ||||
| -rw-r--r-- | lib/libavb/avb_cmdline.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 6e2ef8285a..c500c45881 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -381,8 +381,12 @@ config TRUSTY_UNLOCK_PERMISSION bool "Support unlock permission protection in trusty" depends on IMX_TRUSTY_OS +config ANDROID_DYNAMIC_PARTITION + bool "Support to boot up Android with system image in logical partitions" + config VIRTUAL_AB_SUPPORT bool "Support virtual AB update" + select ANDROID_DYNAMIC_PARTITION config LOAD_KEY_FROM_RPMB bool "Support load AVB public key from RPMB storage" diff --git a/lib/libavb/avb_cmdline.c b/lib/libavb/avb_cmdline.c index bddcc2f627..3c2de6c32b 100644 --- a/lib/libavb/avb_cmdline.c +++ b/lib/libavb/avb_cmdline.c @@ -9,7 +9,7 @@ #include "avb_version.h" #include <malloc.h> -#ifdef CONFIG_ANDROID_AUTO_SUPPORT +#ifndef CONFIG_ANDROID_DYNAMIC_PARTITION #define NUM_GUIDS 3 #else #define NUM_GUIDS 2 @@ -24,7 +24,7 @@ char* avb_sub_cmdline(AvbOps* ops, const char* ab_suffix, bool using_boot_for_vbmeta, const AvbCmdlineSubstList* additional_substitutions) { -#ifdef CONFIG_ANDROID_AUTO_SUPPORT +#ifndef CONFIG_ANDROID_DYNAMIC_PARTITION const char* part_name_str[NUM_GUIDS] = {"system", "boot", "vbmeta"}; const char* replace_str[NUM_GUIDS] = {"$(ANDROID_SYSTEM_PARTUUID)", "$(ANDROID_BOOT_PARTUUID)", @@ -42,7 +42,7 @@ char* avb_sub_cmdline(AvbOps* ops, * partition. */ if (using_boot_for_vbmeta) { -#ifdef CONFIG_ANDROID_AUTO_SUPPORT +#ifndef CONFIG_ANDROID_DYNAMIC_PARTITION part_name_str[2] = "boot"; #else part_name_str[1] = "boot"; |