diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-07-09 09:29:05 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-07-09 15:57:26 +0200 |
| commit | e60e2c0d3f44f42642bb4dbf648a3b25142fd8d1 (patch) | |
| tree | 0264b759455ea4175876803bd1540e31b26081d0 | |
| parent | cf71e245a5ca0e3854eb3e83e5cfe95c439db180 (diff) | |
Revert "configs: colibri_imx7: enable CAAM driver"
While this seems to work on the eMMC SKU, unfortunately, this no longer boots on the raw NAND one.
This reverts commit edb411e2e6aeb7214641a53d78d1dc4a943290a0.
Conflicts:
configs/colibri_imx7_defconfig
| -rw-r--r-- | configs/colibri_imx7_defconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index 2101f7019e..579b444b28 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -2,12 +2,10 @@ CONFIG_ARM=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MX7=y CONFIG_SYS_TEXT_BASE=0x87800000 -CONFIG_SECURE_BOOT=y CONFIG_TARGET_COLIBRI_IMX7=y CONFIG_NR_DRAM_BANKS=1 CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=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 @@ -35,7 +33,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)" @@ -47,7 +44,6 @@ CONFIG_ENV_IS_IN_NAND=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 |