diff options
| author | faqiang.zhu <faqiang.zhu@nxp.com> | 2020-02-25 10:18:24 +0800 |
|---|---|---|
| committer | Ji Luo <ji.luo@nxp.com> | 2020-05-15 17:34:42 +0800 |
| commit | 5b184052ceff17a74523a4097990d320e5103466 (patch) | |
| tree | 574068568d718f26cb2484994ad2f644a248493b /lib | |
| parent | 01075d8e08ac7fccd27f4f6b652931091ec7463d (diff) | |
MA-16457-1 avoid to try to access system partition
To enable dynamic partition feature, system partition will be a logic
parition in "super" partition, uboot can't access system partition
anymore.
In i.MX Android use case, only vbmeta partition is used to verify other
imags. boot and system are not used. so there is no need to access
system partition to get avb device info, remove system partition from
avb lib.
Now, standard Android will boot with ramdisk in boot.img, there is no
need to provide root info to kernel for standard Android. so only
Android Auto will provide this info.
Change-Id: I99a43eb8f7aa1dc635e3937c93266f881c9b3655
Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com>
(cherry picked from commit 3a2418a1cc097cd956347fc12b0b4e0566652bfd)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libavb/avb_cmdline.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/libavb/avb_cmdline.c b/lib/libavb/avb_cmdline.c index abff8963fc..7158a1b385 100644 --- a/lib/libavb/avb_cmdline.c +++ b/lib/libavb/avb_cmdline.c @@ -9,7 +9,7 @@ #include "avb_version.h" #include <malloc.h> -#define NUM_GUIDS 3 +#define NUM_GUIDS 2 /* Substitutes all variables (e.g. $(ANDROID_SYSTEM_PARTUUID)) with * values. Returns NULL on OOM, otherwise the cmdline with values @@ -20,9 +20,8 @@ char* avb_sub_cmdline(AvbOps* ops, const char* ab_suffix, bool using_boot_for_vbmeta, const AvbCmdlineSubstList* additional_substitutions) { - const char* part_name_str[NUM_GUIDS] = {"system", "boot", "vbmeta"}; - const char* replace_str[NUM_GUIDS] = {"$(ANDROID_SYSTEM_PARTUUID)", - "$(ANDROID_BOOT_PARTUUID)", + const char* part_name_str[NUM_GUIDS] = {"boot", "vbmeta"}; + const char* replace_str[NUM_GUIDS] = {"$(ANDROID_BOOT_PARTUUID)", "$(ANDROID_VBMETA_PARTUUID)"}; char* ret = NULL; AvbIOResult io_ret; @@ -32,7 +31,7 @@ char* avb_sub_cmdline(AvbOps* ops, * partition. */ if (using_boot_for_vbmeta) { - part_name_str[2] = "boot"; + part_name_str[1] = "boot"; } /* Replace unique partition GUIDs */ |