summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorzhang sanshan <sanshan.zhang@nxp.com>2017-05-15 10:45:07 +0800
committerChen Guoyin <guoyin.chen@nxp.com>2017-07-10 15:08:53 +0800
commit1c79796a523255af5d012fa3cbc5400131b3b8b9 (patch)
tree671d094845bc787fca67f158f73084db3ee80f49 /common
parent893ec7807779aa34ce49866f03e49c592fff9543 (diff)
downloadu-boot-imx-1c79796a523255af5d012fa3cbc5400131b3b8b9.zip
u-boot-imx-1c79796a523255af5d012fa3cbc5400131b3b8b9.tar.gz
u-boot-imx-1c79796a523255af5d012fa3cbc5400131b3b8b9.tar.bz2
MA-9409-1 enable avb on android things.
Fix issue for API changed from v2017. porting below patch from v2016. commit 44834fd12f60a090e3d10ab6f84a75460894d49d Change-Id: Ifaf0b86dd29648f9150646f00f54502676df9013 Signed-off-by: zhang sanshan <sanshan.zhang@nxp.com>
Diffstat (limited to 'common')
-rw-r--r--common/image-android.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/common/image-android.c b/common/image-android.c
index d2ad997..d79de0f 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -118,6 +118,14 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify,
sprintf(newbootargs, " androidboot.slot_suffix=%s", get_slot_suffix());
strcat(commandline, newbootargs);
#endif
+#ifdef CONFIG_AVB_SUPPORT
+ /* secondary cmdline added by avb */
+ char *bootargs_sec = getenv("bootargs_sec");
+ if (bootargs_sec) {
+ strcat(commandline, " ");
+ strcat(commandline, bootargs_sec);
+ }
+#endif
setenv("bootargs", commandline);
if (os_data) {