Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit b2af8d60551f0474014a91ac03d109e1fc40a52e

Authored by Ji Luo
1 parent 54781b897c
Exists in smarc_8mq-imx_v2020.04_5.4.24_2.1.0 and in 1 other branch smarc_8mm-imx_v2020.04_5.4.24_2.1.0

MA-16877 Skip kernel hab authentication for android 

Android use AVB to verify the kernel, hab authentication is
not necessary for boot image.

For imx8m, don't authenticate the kernel image when AVB
(CONFIG_AVB_SUPPORT) is enabled. For imx8q, as android uses
different 'CONFIG_EXTRA_ENV_SETTINGS' and 'CONFIG_BOOTCOMMAND'
with linux bsp, so it won't try to do kernel hab authentication.
by default.

Test: boot imx8mp with "CONFIG_IMX_HAB" and imx8qxp with
      'CONFIG_AHAB_BOOT'.

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

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -42,7 +42,7 @@
42 42 if (ret != 0)
43 43 return 1;
44 44  
45   -#ifdef CONFIG_IMX_HAB
  45 +#if defined(CONFIG_IMX_HAB) && !defined(CONFIG_AVB_SUPPORT)
46 46 extern int authenticate_image(
47 47 uint32_t ddr_start, uint32_t raw_image_size);
48 48 if (authenticate_image(ld, image_size) != 0) {