Merge tag 'u-boot-imx-20211020' of https://source.denx.de/u-boot/custodians/u-boot-imx

u-boot-imx-20211020
-------------------

First PR from u-boot-imx for 2022.01

CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/9535

- new board: kontron-sl-mx8mm
- imx8m:
	- fix secure boot
- imx ESDHC: fixes
- i.MX53: Support thum2, bmode and fixes for Menlo board
	  usbarmory switch to Ethernet driver model
- imx6 :
	- DDR calibration for Toradex boards
- imx7:
	- Fixes
- Updated gateworks boards (ventana / venice)

# gpg verification failed.

diff --combined Makefile
index 6f2474b,ddee452..5194e4d
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -299,7 -299,9 +299,7 @@@ KBUILD_HOSTLDLIBS   := $(HOST_LFS_LIBS
  # have older compilers as their default, so we make it explicit for
  # these that our host tools are GNU11 (i.e. C11 w/ GNU extensions).
  CSTD_FLAG := -std=gnu11
 -ifeq ($(HOSTOS),linux)
  KBUILD_HOSTCFLAGS += $(CSTD_FLAG)
 -endif
  
  ifeq ($(HOSTOS),cygwin)
  KBUILD_HOSTCFLAGS     += -ansi
@@@ -413,13 -415,7 +413,13 @@@ PERL             = per
  PYTHON                ?= python
  PYTHON2               = python2
  PYTHON3               ?= python3
 -DTC           ?= $(objtree)/scripts/dtc/dtc
 +
 +# The devicetree compiler and pylibfdt are automatically built unless DTC is
 +# provided. If DTC is provided, it is assumed the pylibfdt is available too.
 +DTC_INTREE    := $(objtree)/scripts/dtc/dtc
 +DTC           ?= $(DTC_INTREE)
 +DTC_MIN_VERSION       := 010406
 +
  CHECK         = sparse
  
  CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
@@@ -1339,9 -1335,6 +1339,6 @@@ $(U_BOOT_ITS): $(subst ",,$(CONFIG_SPL_
  else
  ifneq ($(CONFIG_USE_SPL_FIT_GENERATOR),)
  U_BOOT_ITS := u-boot.its
- ifeq ($(CONFIG_SPL_FIT_GENERATOR),"arch/arm/mach-imx/mkimage_fit_atf.sh")
- U_BOOT_ITS_DEPS += u-boot-nodtb.bin
- endif
  ifeq ($(CONFIG_SPL_FIT_GENERATOR),"arch/arm/mach-rockchip/make_fit_atf.py")
  U_BOOT_ITS_DEPS += u-boot
  endif
@@@ -1958,29 -1951,9 +1955,29 @@@ endi
  
  endif
  
 +# Check dtc and pylibfdt, if DTC is provided, else build them
  PHONY += scripts_dtc
  scripts_dtc: scripts_basic
 -      $(Q)$(MAKE) $(build)=scripts/dtc
 +      $(Q)if test "$(DTC)" = "$(DTC_INTREE)"; then \
 +              $(MAKE) $(build)=scripts/dtc; \
 +      else \
 +              if ! $(DTC) -v >/dev/null; then \
 +                      echo '*** Failed to check dtc version: $(DTC)'; \
 +                      false; \
 +              else \
 +                      if test "$(call dtc-version)" -lt $(DTC_MIN_VERSION); then \
 +                              echo '*** Your dtc is too old, please upgrade to dtc $(DTC_MIN_VERSION) or newer'; \
 +                              false; \
 +                      else \
 +                              if [ -n "$(CONFIG_PYLIBFDT)" ]; then \
 +                                      if ! echo "import libfdt" | $(PYTHON3) 2>/dev/null; then \
 +                                              echo '*** pylibfdt does not seem to be available with $(PYTHON3)'; \
 +                                              false; \
 +                                      fi; \
 +                              fi; \
 +                      fi; \
 +              fi; \
 +      fi
  
  # ---------------------------------------------------------------------------
  quiet_cmd_cpp_lds = LDS     $@

diff --combined arch/arm/dts/Makefile
index ed3d360,6168d8d..b549f3c
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -158,36 -158,30 +158,36 @@@ dtb-$(CONFIG_ARCH_S5P4418) += 
        s5p4418-nanopi2.dtb
  
  dtb-$(CONFIG_ARCH_MESON) += \
 +      meson-axg-s400.dtb \
 +      meson-axg-jethome-jethub-j100.dtb \
        meson-gxbb-nanopi-k2.dtb \
        meson-gxbb-odroidc2.dtb \
        meson-gxbb-nanopi-k2.dtb \
        meson-gxbb-p200.dtb \
        meson-gxbb-p201.dtb \
 -      meson-gxl-s905x-p212.dtb \
        meson-gxl-s805x-libretech-ac.dtb \
 +      meson-gxl-s905d-libretech-pc.dtb \
 +      meson-gxl-s905w-jethome-jethub-j80.dtb \
 +      meson-gxl-s905x-khadas-vim.dtb \
        meson-gxl-s905x-libretech-cc.dtb \
        meson-gxl-s905x-libretech-cc-v2.dtb \
 -      meson-gxl-s905x-khadas-vim.dtb \
 -      meson-gxl-s905d-libretech-pc.dtb \
 +      meson-gxl-s905x-p212.dtb \
        meson-gxm-khadas-vim2.dtb \
        meson-gxm-s912-libretech-pc.dtb \
        meson-gxm-wetek-core2.dtb \
 -      meson-axg-s400.dtb \
 -      meson-g12a-u200.dtb \
 +      meson-g12a-radxa-zero.dtb \
        meson-g12a-sei510.dtb \
 +      meson-g12a-u200.dtb \
 +      meson-g12b-a311d-khadas-vim3.dtb \
        meson-g12b-gtking.dtb \
        meson-g12b-gtking-pro.dtb \
 +      meson-g12b-gsking-x.dtb \
        meson-g12b-odroid-n2.dtb \
        meson-g12b-odroid-n2-plus.dtb \
 -      meson-g12b-a311d-khadas-vim3.dtb \
 +      meson-sm1-bananapi-m5.dtb \
        meson-sm1-khadas-vim3l.dtb \
        meson-sm1-odroid-c4.dtb \
 +      meson-sm1-odroid-hc4.dtb \
        meson-sm1-sei610.dtb
  dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra20-medcom-wide.dtb \
@@@ -638,7 -632,6 +638,7 @@@ dtb-$(CONFIG_MACH_SUN50I_H5) += 
        sun50i-h5-libretech-all-h5-cc.dtb \
        sun50i-h5-nanopi-neo2.dtb \
        sun50i-h5-nanopi-neo-plus2.dtb \
 +      sun50i-h5-nanopi-r1s-h5.dtb \
        sun50i-h5-orangepi-zero-plus.dtb \
        sun50i-h5-orangepi-pc2.dtb \
        sun50i-h5-orangepi-prime.dtb \
@@@ -822,7 -815,9 +822,9 @@@ dtb-$(CONFIG_MX6UL) += 
        imx6ul-liteboard.dtb \
        imx6ul-phytec-segin-ff-rdk-nand.dtb \
        imx6ul-pico-hobbit.dtb \
-       imx6ul-pico-pi.dtb
+       imx6ul-pico-pi.dtb \
+       imx6ul-kontron-n631x-s.dtb \
+       imx6ull-kontron-n641x-s.dtb
  
  dtb-$(CONFIG_MX6ULL) += \
        imx6ull-14x14-evk.dtb \
@@@ -877,6 -872,8 +879,8 @@@ dtb-$(CONFIG_ARCH_IMX8M) += 
        imx8mm-evk.dtb \
        imx8mm-icore-mx8mm-ctouch2.dtb \
        imx8mm-icore-mx8mm-edimm2.2.dtb \
+       imx8mm-kontron-n801x-s.dtb \
+       imx8mm-kontron-n801x-s-lvds.dtb \
        imx8mm-venice.dtb \
        imx8mm-venice-gw71xx-0x.dtb \
        imx8mm-venice-gw72xx-0x.dtb \
@@@ -1144,6 -1141,8 +1148,8 @@@ dtb-$(CONFIG_TARGET_PRESIDIO_ASIC) += c
  
  dtb-$(CONFIG_TARGET_IMX8MM_CL_IOT_GATE) += imx8mm-cl-iot-gate.dtb
  
+ dtb-$(CONFIG_TARGET_IMX8MM_CL_IOT_GATE_OPTEE) += imx8mm-cl-iot-gate-optee.dtb
+ 
  dtb-$(CONFIG_TARGET_EA_LPC3250DEVKITV2) += lpc3250-ea3250.dtb
  
  targets += $(dtb-y)

diff --combined configs/mx7ulp_com_defconfig
index 84aca96,bd3f52d..bab5d6d
--- 1/configs/mx7ulp_com_defconfig
--- 2/configs/mx7ulp_com_defconfig
+++ b/configs/mx7ulp_com_defconfig
@@@ -9,6 -9,8 +9,8 @@@ CONFIG_DM_GPIO=
  CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-com"
  CONFIG_LDO_ENABLED_MODE=y
  CONFIG_TARGET_MX7ULP_COM=y
+ CONFIG_USE_BOOTCOMMAND=y
+ CONFIG_BOOTCOMMAND="if run loadimage; then run mmcboot; fi"
  CONFIG_SYS_LOAD_ADDR=0x60800000
  CONFIG_DEFAULT_FDT_FILE="imx7ulp-com"
  CONFIG_BOARD_EARLY_INIT_F=y
@@@ -34,6 -36,7 +36,6 @@@ CONFIG_DM_I2C=
  CONFIG_SYS_I2C_IMX_LPI2C=y
  CONFIG_FSL_USDHC=y
  CONFIG_DM_SPI_FLASH=y
 -CONFIG_SF_DEFAULT_MODE=0
  CONFIG_SF_DEFAULT_SPEED=40000000
  CONFIG_SPI_FLASH_ATMEL=y
  CONFIG_PINCTRL=y

diff --combined drivers/mtd/nand/raw/Kconfig
index 332f9d7,d4da639..cb0c0a1
--- 1/drivers/mtd/nand/raw/Kconfig
--- 2/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@@ -369,7 -369,7 +369,7 @@@ config NAND_MX
        imply CMD_NAND
        help
          This enables the NAND driver for the NAND flash controller on the
-         i.MX27 / i.MX31 / i.MX5 rocessors.
+         i.MX27 / i.MX31 / i.MX5 processors.
  
  config NAND_MXS
        bool "MXS NAND support"
@@@ -398,12 -398,6 +398,12 @@@ config NAND_MXS_USE_MINIMUM_EC
  
  endif
  
 +config NAND_MXIC
 +      bool "Macronix raw NAND controller"
 +      select SYS_NAND_SELF_INIT
 +      help
 +        This selects the Macronix raw NAND controller driver.
 +
  config NAND_ZYNQ
        bool "Support for Zynq Nand controller"
        select SYS_NAND_SELF_INIT