From: Tom Rini <trini@konsulko.com>
Date: Mon, 9 Dec 2019 15:32:08 +0000 (-0500)
Subject: Merge tag 'u-boot-imx-20191209' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
X-Git-Tag: v2020.01-rc5~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2f02845817bec0dd0f89eb0d829b17b40d005afc;p=oweals%2Fu-boot.git

Merge tag 'u-boot-imx-20191209' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

Fixes for 2020.01
-----------------

- imx8qxp_mek: increase buffer sizes and args number
- Fixes for imx7ulp
- imx8mm: Fix the first root clock in imx8mm_ahb_sels[]
- colibri_imx7: reserve DDR memory for Cortex-M4
- vining2000: fixes and convert to ethernet DM
- imx8m: fix rom version check to unbreak some B0 chips
- tbs2910: Disable VxWorks image booting support
---

2f02845817bec0dd0f89eb0d829b17b40d005afc
diff --cc configs/vining_2000_defconfig
index 1ff5acb730,65e16f5a7b..c1542fe5d3
--- a/configs/vining_2000_defconfig
+++ b/configs/vining_2000_defconfig
@@@ -13,8 -24,12 +24,11 @@@ CONFIG_SYS_CONSOLE_IS_IN_ENV=
  CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_BOARD_EARLY_INIT_F=y
+ CONFIG_SPL_FS_EXT4=y
+ CONFIG_SPL_I2C_SUPPORT=y
+ CONFIG_SPL_WATCHDOG_SUPPORT=y
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_BOOTZ=y
 -# CONFIG_CMD_FLASH is not set
  CONFIG_CMD_GPIO=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_MMC=y