From: Tom Rini Date: Thu, 29 Oct 2020 13:10:24 +0000 (-0400) Subject: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq X-Git-Url: http://git.dujemihanovic.xyz/%22http:/www.sics.se/static/git-logo.png?a=commitdiff_plain;h=eca57cafa521345b2fc71616ae47245598dad53d;p=u-boot.git 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 --- eca57cafa521345b2fc71616ae47245598dad53d diff --cc cmd/Makefile index 0cbee6c2f8,a1eee43599..dd86675bf2 --- a/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 b6ac5232b7,789bb5a05e..7585f2b908 --- a/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 1bb657df3b,9c36d2a461..0f45df1021 --- a/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 f0d49bad29,f6adc529b1..1cd669688c --- a/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_defconfig index da2a7617c8,4e7e25abc0..e20fcf5521 --- a/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 d3d8fcb633,b50946c48a..52bdb8d08d --- a/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 08b9ec2c08,e470e63b0c..b68041d170 --- a/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 ef194dfc82,58775c0162..431d53fa52 --- a/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 e64cb38699,0be05b641b..ba9d49985b --- a/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_defconfig index a71f7b3ba7,b53185e5f8..c91fa0bf06 --- a/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 d24b3682ed,028cc239ae..b59ec99ea0 --- a/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 2b117304df,2899d1bdd3..e8e1aa3d7a --- a/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_defconfig index af2b5aafac,15d9203bbd..fccdc72ded --- a/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 dd80eb4a60,4edfdb58bb..9611349032 --- a/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