Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

- Bug fixes and updates on vid, ls1088a lx2160a and other layerscape
  platforms.
- Add optee_rpmb support for LX2 & Kontron sl28 support

diff --cc cmd/Kconfig
Simple merge

diff --cc cmd/Makefile
index 0cbee6c,a1eee43..dd86675
--- 1/cmd/Makefile
--- 2/cmd/Makefile
+++ b/cmd/Makefile
@@@ -94,10 -94,10 +94,11 @@@ obj-$(CONFIG_CMD_MEMORY) += mem.
  obj-$(CONFIG_CMD_IO) += io.o
  obj-$(CONFIG_CMD_MFSL) += mfsl.o
  obj-$(CONFIG_CMD_MII) += mii.o
 -obj-$(CONFIG_CMD_MDIO) += mdio.o
  obj-$(CONFIG_CMD_MISC) += misc.o
 +obj-$(CONFIG_CMD_MDIO) += mdio.o
 +obj-$(CONFIG_CMD_SLEEP) += sleep.o
  obj-$(CONFIG_CMD_MMC) += mmc.o
+ obj-$(CONFIG_CMD_OPTEE_RPMB) += optee_rpmb.o
  obj-$(CONFIG_MP) += mp.o
  obj-$(CONFIG_CMD_MTD) += mtd.o
  obj-$(CONFIG_CMD_MTDPARTS) += mtdparts.o

diff --cc configs/ls1021aqds_ddr4_nor_defconfig
index b6ac523,789bb5a..7585f2b
--- 1/configs/ls1021aqds_ddr4_nor_defconfig
--- 2/configs/ls1021aqds_ddr4_nor_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_defconfig
@@@ -70,6 -70,8 +70,8 @@@ CONFIG_DM_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_STORAGE=y
 -CONFIG_VIDEO_FSL_DCU_FB=y
 -CONFIG_VIDEO=y
 +# CONFIG_VIDEO_FSL_DCU_FB is not set
 +# CONFIG_VIDEO is not set
  # CONFIG_VIDEO_SW_CURSOR is not set
+ CONFIG_CMD_NVME=y
+ CONFIG_NVME=y

diff --cc configs/ls1021aqds_ddr4_nor_lpuart_defconfig
index 1bb657d,9c36d2a..0f45df1
--- 1/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
--- 2/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
@@@ -70,6 -70,8 +70,8 @@@ CONFIG_DM_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_STORAGE=y
 -CONFIG_VIDEO_FSL_DCU_FB=y
 -CONFIG_VIDEO=y
 +# CONFIG_VIDEO_FSL_DCU_FB is not set
 +# CONFIG_VIDEO is not set
  # CONFIG_VIDEO_SW_CURSOR is not set
+ CONFIG_CMD_NVME=y
+ CONFIG_NVME=y

diff --cc configs/ls1021aqds_nand_defconfig
index f0d49ba,f6adc52..1cd6696
--- 1/configs/ls1021aqds_nand_defconfig
--- 2/configs/ls1021aqds_nand_defconfig
+++ b/configs/ls1021aqds_nand_defconfig
@@@ -85,6 -85,8 +85,8 @@@ CONFIG_DM_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_STORAGE=y
 -CONFIG_VIDEO_FSL_DCU_FB=y
 -CONFIG_VIDEO=y
 +# CONFIG_VIDEO_FSL_DCU_FB is not set
 +# CONFIG_VIDEO is not set
  # CONFIG_VIDEO_SW_CURSOR is not set
+ CONFIG_CMD_NVME=y
+ CONFIG_NVME=y

diff --cc configs/ls1021aqds_nor_SECURE_BOOT_defconfig
Simple merge

diff --cc configs/ls1021aqds_nor_defconfig
index da2a761,4e7e25a..e20fcf5
--- 1/configs/ls1021aqds_nor_defconfig
--- 2/configs/ls1021aqds_nor_defconfig
+++ b/configs/ls1021aqds_nor_defconfig
@@@ -71,6 -71,8 +71,8 @@@ CONFIG_DM_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_STORAGE=y
 -CONFIG_VIDEO_FSL_DCU_FB=y
 -CONFIG_VIDEO=y
 +# CONFIG_VIDEO_FSL_DCU_FB is not set
 +# CONFIG_VIDEO is not set
  # CONFIG_VIDEO_SW_CURSOR is not set
+ CONFIG_CMD_NVME=y
+ CONFIG_NVME=y

diff --cc configs/ls1021aqds_nor_lpuart_defconfig
index d3d8fcb,b50946c..52bdb8d
--- 1/configs/ls1021aqds_nor_lpuart_defconfig
--- 2/configs/ls1021aqds_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_nor_lpuart_defconfig
@@@ -71,6 -71,8 +71,8 @@@ CONFIG_DM_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_STORAGE=y
 -CONFIG_VIDEO_FSL_DCU_FB=y
 -CONFIG_VIDEO=y
 +# CONFIG_VIDEO_FSL_DCU_FB is not set
 +# CONFIG_VIDEO is not set
  # CONFIG_VIDEO_SW_CURSOR is not set
+ CONFIG_CMD_NVME=y
+ CONFIG_NVME=y

diff --cc configs/ls1021aqds_qspi_defconfig
index 08b9ec2,e470e63..b68041d
--- 1/configs/ls1021aqds_qspi_defconfig
--- 2/configs/ls1021aqds_qspi_defconfig
+++ b/configs/ls1021aqds_qspi_defconfig
@@@ -70,6 -70,8 +70,8 @@@ CONFIG_DM_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_STORAGE=y
 -CONFIG_VIDEO_FSL_DCU_FB=y
 -CONFIG_VIDEO=y
 +# CONFIG_VIDEO_FSL_DCU_FB is not set
 +# CONFIG_VIDEO is not set
  # CONFIG_VIDEO_SW_CURSOR is not set
+ CONFIG_CMD_NVME=y
+ CONFIG_NVME=y

diff --cc configs/ls1021aqds_sdcard_ifc_defconfig
index ef194df,58775c0..431d53f
--- 1/configs/ls1021aqds_sdcard_ifc_defconfig
--- 2/configs/ls1021aqds_sdcard_ifc_defconfig
+++ b/configs/ls1021aqds_sdcard_ifc_defconfig
@@@ -84,6 -84,8 +84,8 @@@ CONFIG_DM_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_STORAGE=y
 -CONFIG_VIDEO_FSL_DCU_FB=y
 -CONFIG_VIDEO=y
 +# CONFIG_VIDEO_FSL_DCU_FB is not set
 +# CONFIG_VIDEO is not set
  # CONFIG_VIDEO_SW_CURSOR is not set
+ CONFIG_CMD_NVME=y
+ CONFIG_NVME=y

diff --cc configs/ls1021aqds_sdcard_qspi_defconfig
index e64cb38,0be05b6..ba9d499
--- 1/configs/ls1021aqds_sdcard_qspi_defconfig
--- 2/configs/ls1021aqds_sdcard_qspi_defconfig
+++ b/configs/ls1021aqds_sdcard_qspi_defconfig
@@@ -82,6 -82,8 +82,8 @@@ CONFIG_DM_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_STORAGE=y
 -CONFIG_VIDEO_FSL_DCU_FB=y
 -CONFIG_VIDEO=y
 +# CONFIG_VIDEO_FSL_DCU_FB is not set
 +# CONFIG_VIDEO is not set
  # CONFIG_VIDEO_SW_CURSOR is not set
+ CONFIG_CMD_NVME=y
+ CONFIG_NVME=y

diff --cc configs/ls1021atwr_nor_SECURE_BOOT_defconfig
Simple merge

diff --cc configs/ls1021atwr_nor_defconfig
index a71f7b3,b53185e..c91fa0b
--- 1/configs/ls1021atwr_nor_defconfig
--- 2/configs/ls1021atwr_nor_defconfig
+++ b/configs/ls1021atwr_nor_defconfig
@@@ -65,6 -65,8 +65,8 @@@ CONFIG_USB=
  CONFIG_DM_USB=y
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
 -CONFIG_VIDEO_FSL_DCU_FB=y
 -CONFIG_VIDEO=y
 +# CONFIG_VIDEO_FSL_DCU_FB is not set
 +# CONFIG_VIDEO is not set
  # CONFIG_VIDEO_SW_CURSOR is not set
+ CONFIG_CMD_NVME=y
+ CONFIG_NVME=y

diff --cc configs/ls1021atwr_nor_lpuart_defconfig
index d24b368,028cc23..b59ec99
--- 1/configs/ls1021atwr_nor_lpuart_defconfig
--- 2/configs/ls1021atwr_nor_lpuart_defconfig
+++ b/configs/ls1021atwr_nor_lpuart_defconfig
@@@ -66,6 -66,8 +66,8 @@@ CONFIG_USB=
  CONFIG_DM_USB=y
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
 -CONFIG_VIDEO_FSL_DCU_FB=y
 -CONFIG_VIDEO=y
 +# CONFIG_VIDEO_FSL_DCU_FB is not set
 +# CONFIG_VIDEO is not set
  # CONFIG_VIDEO_SW_CURSOR is not set
+ CONFIG_CMD_NVME=y
+ CONFIG_NVME=y

diff --cc configs/ls1021atwr_qspi_defconfig
index 2b11730,2899d1b..e8e1aa3
--- 1/configs/ls1021atwr_qspi_defconfig
--- 2/configs/ls1021atwr_qspi_defconfig
+++ b/configs/ls1021atwr_qspi_defconfig
@@@ -68,6 -68,8 +68,8 @@@ CONFIG_USB=
  CONFIG_DM_USB=y
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
 -CONFIG_VIDEO_FSL_DCU_FB=y
 -CONFIG_VIDEO=y
 +# CONFIG_VIDEO_FSL_DCU_FB is not set
 +# CONFIG_VIDEO is not set
  # CONFIG_VIDEO_SW_CURSOR is not set
+ CONFIG_CMD_NVME=y
+ CONFIG_NVME=y

diff --cc configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
Simple merge

diff --cc configs/ls1021atwr_sdcard_ifc_defconfig
index af2b5aa,15d9203..fccdc72
--- 1/configs/ls1021atwr_sdcard_ifc_defconfig
--- 2/configs/ls1021atwr_sdcard_ifc_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_defconfig
@@@ -78,6 -78,8 +78,8 @@@ CONFIG_USB=
  CONFIG_DM_USB=y
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
 -CONFIG_VIDEO_FSL_DCU_FB=y
 -CONFIG_VIDEO=y
 +# CONFIG_VIDEO_FSL_DCU_FB is not set
 +# CONFIG_VIDEO is not set
  # CONFIG_VIDEO_SW_CURSOR is not set
+ CONFIG_CMD_NVME=y
+ CONFIG_NVME=y

diff --cc configs/ls1021atwr_sdcard_qspi_defconfig
index dd80eb4,4edfdb5..9611349
--- 1/configs/ls1021atwr_sdcard_qspi_defconfig
--- 2/configs/ls1021atwr_sdcard_qspi_defconfig
+++ b/configs/ls1021atwr_sdcard_qspi_defconfig
@@@ -79,6 -79,8 +79,8 @@@ CONFIG_USB=
  CONFIG_DM_USB=y
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
 -CONFIG_VIDEO_FSL_DCU_FB=y
 -CONFIG_VIDEO=y
 +# CONFIG_VIDEO_FSL_DCU_FB is not set
 +# CONFIG_VIDEO is not set
  # CONFIG_VIDEO_SW_CURSOR is not set
+ CONFIG_CMD_NVME=y
+ CONFIG_NVME=y