From 17a0dd7344e1495338258659ef060cf0aaa1ac8b Mon Sep 17 00:00:00 2001 From: Ji Luo Date: Thu, 23 Aug 2018 12:14:41 +0800 Subject: [iot] Enable HAB for imx8m Enable HAB for imx8m Android Things platform, this will enable HAB verify for bootloader.img(atf+tee+u-boot) at spl stage. Disable the HAB verify for bootimg because we will use AVB to verify it. Test: Build and boot ok on AIY. Change-Id: Ia6ee456c7c5fa71afc3740689adf898f411c6c4e Signed-off-by: Ji Luo --- cmd/booti.c | 2 +- configs/imx8mq_phanbell_androidthings_defconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/booti.c b/cmd/booti.c index b605e9492b3..e7039b753fc 100644 --- a/cmd/booti.c +++ b/cmd/booti.c @@ -44,7 +44,7 @@ static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc, if (ret != 0) return 1; -#ifdef CONFIG_SECURE_BOOT +#if defined(CONFIG_SECURE_BOOT) && !defined(CONFIG_AVB_SUPPORT) extern int authenticate_image( uint32_t ddr_start, uint32_t raw_image_size); if (authenticate_image(ld, image_size) != 0) { diff --git a/configs/imx8mq_phanbell_androidthings_defconfig b/configs/imx8mq_phanbell_androidthings_defconfig index 6ad2f407107..ce1a1821850 100644 --- a/configs/imx8mq_phanbell_androidthings_defconfig +++ b/configs/imx8mq_phanbell_androidthings_defconfig @@ -71,3 +71,4 @@ CONFIG_USB_DWC3_GADGET=y CONFIG_CMD_UUID=y CONFIG_LIB_RAND=y CONFIG_AVB_SUPPORT=y +CONFIG_SECURE_BOOT=y -- cgit v1.2.3