diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-04 11:27:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-04 11:28:16 -0400 |
| commit | 50c84208ad50a27382c64af911abba4510a8b608 (patch) | |
| tree | 1b79a2e167ca4094d4adc80ab1195f42e792e309 /configs/colibri_imx7_defconfig | |
| parent | d80bb749fab53da72c4a0e09b8c2d2aaa3103c91 (diff) | |
| parent | e17cbdd050f7127737988997f4a01583b34f7c96 (diff) | |
Merge branch 'next'
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/colibri_imx7_defconfig')
| -rw-r--r-- | configs/colibri_imx7_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index 39149167e00..c22332c489e 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -5,6 +5,7 @@ CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x8c000000 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x380000 +CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-rawnand" CONFIG_TARGET_COLIBRI_IMX7=y @@ -12,7 +13,6 @@ CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y CONFIG_IMX_HAB=y CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D" CONFIG_BOOTDELAY=1 # CONFIG_USE_BOOTCOMMAND is not set CONFIG_USE_PREBOOT=y @@ -59,9 +59,9 @@ CONFIG_TFTP_BLOCKSIZE=16352 CONFIG_BOUNCE_BUFFER=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_ENV=y -CONFIG_FSL_CAAM=y CONFIG_DFU_NAND=y CONFIG_DM_I2C=y +CONFIG_SYS_I2C_MXC=y CONFIG_FSL_USDHC=y CONFIG_MTD=y CONFIG_DM_MTD=y |