diff options
author | Tom Rini <trini@konsulko.com> | 2021-05-11 12:23:11 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-05-11 12:23:11 -0400 |
commit | 59a2b9e605c5a5e2dff35506a13b51f33d3051b4 (patch) | |
tree | 016d452dff11fc6fd90192d56e575d28757504c3 /configs/ge_bx50v3_defconfig | |
parent | 838157d02edade9bfaa33da216bf109336ab9547 (diff) | |
parent | 7666cccf4f24dd500a9279741a0b64a3f89a7331 (diff) | |
download | u-boot-59a2b9e605c5a5e2dff35506a13b51f33d3051b4.zip u-boot-59a2b9e605c5a5e2dff35506a13b51f33d3051b4.tar.gz u-boot-59a2b9e605c5a5e2dff35506a13b51f33d3051b4.tar.bz2 |
Merge tag 'u-boot-imx-20210502' of https://gitlab.denx.de/u-boot/custodians/u-boot-imxWIP/11May2021
u-boot-imx-20210502
-------------------
- mx6: fixes for Ventana
- local fixes from maintainer
- imx7d: Ronetix's iMX7-CM
- imx8: Ronetix iMX8MQ-CM
Engicam i.Core MX8M
Compulab iot-gate-imx8
- Fixes i.MX8 documentation
- Fixes phy usage with fec
Diffstat (limited to 'configs/ge_bx50v3_defconfig')
-rw-r--r-- | configs/ge_bx50v3_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig index 65755e7..7a95899 100644 --- a/configs/ge_bx50v3_defconfig +++ b/configs/ge_bx50v3_defconfig @@ -44,7 +44,6 @@ CONFIG_OF_LIST="imx6q-bx50v3 imx6q-b850v3 imx6q-b650v3 imx6q-b450v3" CONFIG_DTB_RESELECT=y CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_BOUNCE_BUFFER=y @@ -98,7 +97,8 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP32 is not set CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y -CONFIG_WATCHDOG_TIMEOUT_MSECS=6000 +CONFIG_WATCHDOG_TIMEOUT_MSECS=8000 CONFIG_IMX_WATCHDOG=y CONFIG_BCH=y # CONFIG_EFI_LOADER is not set +CONFIG_ENV_IS_NOWHERE=y |