[PATCH v1] colibri_imx7: disable HAB and CAAM support

[Igor Opaniuk]

From: Igor Opaniuk <igor.opaniuk at toradex.com>

Currently Colibri iMX7 NAND version doesn't boot at all with
HABv4 support enabled. If CSF section is included in the final
imx binary, BootROM every time switches to usb recovery mode.
However eMMC version of the same SoM works without any issues.

Disable HAB and CAAM support for now until the problem is properly
investigated and fixed.

For additional details about the problem check [2], [3], [4].

[1] https://www.nxp.com/docs/en/application-note/AN4581.pdf
[2] https://lists.denx.de/pipermail/u-boot/2019-July/379103.html
[3] https://lists.denx.de/pipermail/u-boot/2019-September/383412.html
[4] https://community.nxp.com/message/1138659

Signed-off-by: Igor Opaniuk <igor.opaniuk at toradex.com>
---

 configs/colibri_imx7_defconfig | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index 29ddd7d3e9..7a4caca977 100644
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -8,8 +8,6 @@ CONFIG_ENV_OFFSET=0x380000
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
-CONFIG_IMX_HAB=y
-# CONFIG_CMD_DEKBLOB is not set
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D"
 CONFIG_BOOTDELAY=1
@@ -39,7 +37,6 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_BOOTP_PXE is not set
 CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
-# CONFIG_CMD_HASH is not set
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:512k(mx7-bcb),1536k(u-boot1)ro,1536k(u-boot2)ro,512k(u-boot-env),-(ubi)"
@@ -52,7 +49,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=16352
-CONFIG_FSL_CAAM=y
 CONFIG_DFU_NAND=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
@@ -84,5 +80,6 @@ CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_BPP8=y
 CONFIG_VIDEO_BPP16=y
 CONFIG_VIDEO_BPP32=y
+CONFIG_SHA_HW_ACCEL=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_FDT_FIXUP_PARTITIONS=y
-- 
2.17.1