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 0cbee6c2f8952b95f44f0f8baee77bba6fc11d59,a1eee43599208ef68b6d9fd034e74f8aba40eb9a..dd86675bf2ace43eff73622be2f25b67d8ee283e
--- 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 b6ac5232b7ac31a6d2ce5643b9c2f5e7651ff011,789bb5a05ea6ae27ba95cdd9b045e665434045cb..7585f2b908afad3b17679c695fd63ce41e81b029
--- 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 1bb657df3b6c93d61fd3b9e8086ba44988c60a17,9c36d2a461a95e5f86c7627809d339365de70b10..0f45df102178bb602a620f5a1c465c483cb1c00f
--- 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 f0d49bad29bde942d2cf44ac24154289091eb468,f6adc529b1b4916039e9840626c77d6984621683..1cd669688c0e2b654b7e59869d350826a2277913
--- 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 da2a7617c81a51df5045f75e94130efda2a1c27a,4e7e25abc0ddebf98f9eb0d6ab4c873accc1671a..e20fcf5521fe62e3d13000c75dc34a96875edbfb
--- 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 d3d8fcb633c6411775ff6a70e12fbea45ffc7081,b50946c48aa86d8983583b7e779a573b3967f154..52bdb8d08d8cd8c359f0379b9bb132be462cdd09
--- 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 08b9ec2c08d630e81d0acd3268ed1dae857b9e03,e470e63b0c888a25b4fcacd4878928db1e445243..b68041d170067b757e79fd42337f8e27e947a177
--- 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 ef194dfc820fcc05ea83651866b7797176dda9d1,58775c0162ff3be3a9de7652061448edf6310119..431d53fa5239366015bb595eeb423b9d1eafc6b8
--- 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 e64cb38699349efeaae263bb449a41d8beb1ee73,0be05b641b76cf42967cc0fa8b4a33da814fbc24..ba9d49985b87b5e0766418517c66cdf83147782e
--- 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 a71f7b3ba7f3cc77e0f6e931ab2da58dcc3b5971,b53185e5f84a3b2aa14b897f2910e0711a3b3b08..c91fa0bf064459a06b1c3c807f5027e7723f62c4
--- 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 d24b3682ed383ade6873c2eb5b66743bfeb8910c,028cc239ae4fb97be1c588e82e64229c17a5d862..b59ec99ea098ceff3f0742bbe98382d2df947004
--- 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 2b117304df1df4cb0055e100797af1a0dbed409d,2899d1bdd38ac5781f5d9ff6e594fb71c747d0ae..e8e1aa3d7aa5382a630730ca38b6bafe9d8a5a82
--- 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 af2b5aafacd43fcd068f63124a2d710c0cfc608b,15d9203bbd2f940d8a7269ce7f61acb175bb2bf3..fccdc72ded6d502bf330bea802b68c694decb12f
--- 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 dd80eb4a60ff62171f276210288097503505ebe8,4edfdb58bb2ed677736d327b8295020c0c99fee7..961134903204ec943988209b276a4c3dcb994fbd
--- 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