Merge git://git.denx.de/u-boot-fsl-qoriq

diff --cc configs/ls1021aqds_nand_defconfig
Simple merge

diff --cc configs/ls1021aqds_nor_SECURE_BOOT_defconfig
Simple merge

diff --cc configs/ls1021aqds_qspi_defconfig
Simple merge

diff --cc configs/ls1021aqds_sdcard_ifc_defconfig
Simple merge

diff --cc configs/ls1021aqds_sdcard_qspi_defconfig
Simple merge

diff --cc configs/ls1021atwr_nor_SECURE_BOOT_defconfig
Simple merge

diff --cc configs/ls1021atwr_nor_defconfig
Simple merge

diff --cc configs/ls1021atwr_nor_lpuart_defconfig
Simple merge

diff --cc configs/ls1021atwr_qspi_defconfig
Simple merge

diff --cc configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
Simple merge

diff --cc configs/ls1021atwr_sdcard_ifc_defconfig
Simple merge

diff --cc configs/ls1021atwr_sdcard_qspi_defconfig
Simple merge