diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-25 23:12:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-25 23:12:43 -0400 |
| commit | 7a1a01c6029039e4fa6aa185cdbbf9a357eecba7 (patch) | |
| tree | f145f655379b2298dc58ef11aa03742c159e7f56 /configs/display5_factory_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/display5_factory_defconfig')
| -rw-r--r-- | configs/display5_factory_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index 7a11b34755..476cada371 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -10,6 +10,7 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x120000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 +CONFIG_MX6Q=y CONFIG_MX6_DDRCAL=y CONFIG_TARGET_DISPLAY5=y CONFIG_SYS_I2C_MXC_I2C1=y @@ -28,7 +29,7 @@ CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y # CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_OF_BOARD_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="echo SDP Display5 recovery" |