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

diff --cc configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
index e0ba24e3a151abb88a22a316e3067d23d47b7e18,0bec6b265f6a4d341c1ebe395eb65a611cce6794..13776236e8e5216b3fc39a686b1ad8774555d59b
--- 1/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
--- 2/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
@@@ -1,9 -1,10 +1,11 @@@
  CONFIG_ARM=y
  CONFIG_TARGET_LS1012ARDB=y
 +CONFIG_SYS_TEXT_BASE=0x40100000
  CONFIG_SECURE_BOOT=y
  CONFIG_FSL_LS_PPA=y
+ CONFIG_QSPI_AHB_INIT=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb"
+ CONFIG_DISTRO_DEFAULTS=y
  # CONFIG_SYS_MALLOC_F is not set
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y

diff --cc configs/ls1046aqds_lpuart_defconfig
Simple merge

diff --cc configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
index 932359548396a22497faf746096be90ba6a3fa4e,a234210726f39455d31a8e3454de2ef577268c23..f2b6be8c8e98d3ca1a76e00007f78a2753b5660a
--- 1/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
--- 2/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
@@@ -1,8 -1,8 +1,9 @@@
  CONFIG_ARM=y
  CONFIG_TARGET_LS1088AQDS=y
 +CONFIG_SYS_TEXT_BASE=0x20100000
  CONFIG_SECURE_BOOT=y
  CONFIG_FSL_LS_PPA=y
+ CONFIG_QSPI_AHB_INIT=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds"
  # CONFIG_SYS_MALLOC_F is not set
  CONFIG_FIT_VERBOSE=y

diff --cc configs/ls1088aqds_qspi_defconfig
index 30064361b6c6835ea63222baf67d4cdbd33ac6f1,f174b1e429fc578b10147a6e657e0e1f5dc49119..43a2fccbab67fa9558b28397556ca21342ef80e5
--- 1/configs/ls1088aqds_qspi_defconfig
--- 2/configs/ls1088aqds_qspi_defconfig
+++ b/configs/ls1088aqds_qspi_defconfig
@@@ -1,7 -1,7 +1,8 @@@
  CONFIG_ARM=y
  CONFIG_TARGET_LS1088AQDS=y
 +CONFIG_SYS_TEXT_BASE=0x20100000
  CONFIG_FSL_LS_PPA=y
+ CONFIG_QSPI_AHB_INIT=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds"
  # CONFIG_SYS_MALLOC_F is not set
  CONFIG_FIT_VERBOSE=y

diff --cc configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
Simple merge

diff --cc configs/ls1088ardb_qspi_defconfig
Simple merge