MA-12943 [VTS] Fix firmware dtbo verify fail

VTS need commandline 'androidboot.dtbo_idx=<dtb_index_in_dtbo>'
to verify fdt overlay. Pass the dtb index as "0" here since we
only have one dtb in dtbo partition and haven't enabled the dtb
overlay.

Test: VTS case "VtsFirmwareDtboVerification#testVerifyOverlay" pass
      on imx8mq and imx8qxp.

Change-Id: I33b089bf5a945e0b558bbb189b183a38f145dcbe
Signed-off-by: Ji Luo <ji.luo@nxp.com>
This commit is contained in:
Ji Luo 2018-09-28 10:21:11 +08:00
parent 95e2bc161a
commit 4d7f5fd7af
1 changed files with 9 additions and 0 deletions

View File

@ -194,6 +194,15 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify,
}
#endif
/* VTS need this commandline to verify fdt overlay. Pass the
* dtb index as "0" here since we only have one dtb in dtbo
* partition and haven't enabled the dtb overlay.
*/
#if defined(CONFIG_ANDROID_SUPPORT) || defined(CONFIG_ANDROID_AUTO_SUPPORT)
sprintf(newbootargs," androidboot.dtbo_idx=0");
strncat(commandline, newbootargs, sizeof(commandline) - strlen(commandline));
#endif
#ifdef CONFIG_IMX_TRUSTY_OS
char *bootargs_trusty = "androidboot.keystore=trusty";
strncat(commandline, " ", sizeof(commandline) - strlen(commandline));