diff options
| author | Tom Rini | 2020-08-25 23:12:43 -0400 |
|---|---|---|
| committer | Tom Rini | 2020-08-25 23:12:43 -0400 |
| commit | 7a1a01c6029039e4fa6aa185cdbbf9a357eecba7 (patch) | |
| tree | f145f655379b2298dc58ef11aa03742c159e7f56 /configs/colibri-imx6ull_defconfig | |
| parent | 9f9ecd3e4d7839e24c182fb7b24937e19b670f1b (diff) | |
| parent | acbc1d86f16cc8372cccb7b862a0b9dc242f8fe5 (diff) | |
Merge tag 'u-boot-imx-20200825' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
For 2020.10
-----------
- mx6: SOCs user selectable
Fix for imx6q_logic
Some DM conversion
- mx7: introduce secondary boot device
Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/720918010
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/colibri-imx6ull_defconfig')
| -rw-r--r-- | configs/colibri-imx6ull_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index 6079b57958b..3defaf0cccb 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -4,12 +4,13 @@ CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x380000 +CONFIG_MX6ULL=y CONFIG_TARGET_COLIBRI_IMX6ULL=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri" CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri-imx6ull/imximage.cfg,MX6ULL,IMX_NAND" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri-imx6ull/imximage.cfg,IMX_NAND" CONFIG_BOOTDELAY=1 # CONFIG_USE_BOOTCOMMAND is not set # CONFIG_CONSOLE_MUX is not set |