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

diff --cc configs/ls1043ardb_nand_SECURE_BOOT_defconfig
Simple merge

diff --cc configs/ls1043ardb_nand_defconfig
Simple merge

diff --cc configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
Simple merge

diff --cc configs/ls1043ardb_sdcard_defconfig
Simple merge

diff --cc include/configs/ls1021aiot.h
Simple merge