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

diff --combined configs/ls1043ardb_nand_SECURE_BOOT_defconfig
index aeee86bf7050708405c5577515da77a9bff23dc9,416182a007280fe124a116364fdba686d9f71ae1..a54a783f500020328d43203557c2297ad1763561
--- 1/configs/ls1043ardb_nand_SECURE_BOOT_defconfig
--- 2/configs/ls1043ardb_nand_SECURE_BOOT_defconfig
+++ b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig
@@@ -17,6 -17,7 +17,7 @@@ CONFIG_BOOTDELAY=1
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)"
  CONFIG_SPL=y
+ CONFIG_SPL_BOARD_INIT=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xf0
  CONFIG_SPL_CRYPTO_SUPPORT=y
@@@ -24,7 -25,6 +25,7 @@@ CONFIG_SPL_HASH_SUPPORT=
  CONFIG_SPL_ENV_SUPPORT=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
 +CONFIG_CMD_IMLS=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_MMC=y

diff --combined configs/ls1043ardb_nand_defconfig
index cc14e0364d5d72c7e17f650b1d9d45c87e69ab08,d680d9386795d464266d272e0c1414e0e1aae44f..ab2f082f6a9ea808c30cb62546f2b1a2f699722a
--- 1/configs/ls1043ardb_nand_defconfig
--- 2/configs/ls1043ardb_nand_defconfig
+++ b/configs/ls1043ardb_nand_defconfig
@@@ -16,13 -16,13 +16,14 @@@ CONFIG_BOOTDELAY=1
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)"
  CONFIG_SPL=y
+ CONFIG_SPL_BOARD_INIT=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xf0
  CONFIG_SPL_ENV_SUPPORT=y
  CONFIG_SPL_I2C_SUPPORT=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
  CONFIG_HUSH_PARSER=y
 +CONFIG_CMD_IMLS=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_MMC=y

diff --combined configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
index c02af9ade841aa9b4a82a384f4dcca7bc7d2aa09,b2144f302c932653bfd278c152e8f9c020b28a14..099004e257b26fe58ce0d58a1b4e829bf9864c8a
--- 1/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
--- 2/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
+++ b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
@@@ -18,13 -18,13 +18,14 @@@ CONFIG_BOOTDELAY=1
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)"
  CONFIG_SPL=y
+ CONFIG_SPL_BOARD_INIT=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x110
  CONFIG_SPL_CRYPTO_SUPPORT=y
  CONFIG_SPL_HASH_SUPPORT=y
  CONFIG_SPL_ENV_SUPPORT=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 +CONFIG_CMD_IMLS=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_MMC=y

diff --combined configs/ls1043ardb_sdcard_defconfig
index 10aafe33b18e5e527a63a8ac286edde96e219d8c,2ce2aba3a1696bc96479a596ddeaa72473a61353..eac931b9b632f8af74910db12737fe6b59b95eeb
--- 1/configs/ls1043ardb_sdcard_defconfig
--- 2/configs/ls1043ardb_sdcard_defconfig
+++ b/configs/ls1043ardb_sdcard_defconfig
@@@ -3,6 -3,7 +3,7 @@@ CONFIG_TARGET_LS1043ARDB=
  CONFIG_SPL_LIBCOMMON_SUPPORT=y
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_FSL_LS_PPA=y
+ CONFIG_SPL_FSL_LS_PPA=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -17,11 -18,11 +18,12 @@@ CONFIG_BOOTDELAY=1
  CONFIG_USE_BOOTARGS=y
  CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)"
  CONFIG_SPL=y
+ CONFIG_SPL_BOARD_INIT=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xf0
  CONFIG_SPL_ENV_SUPPORT=y
  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 +CONFIG_CMD_IMLS=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_MMC=y

diff --combined include/configs/ls1021aiot.h
index 0993898c3d656aa831da69874435734b671de2df,906697f5aa55187710e34e98b9004a08dee4b1cf..63667810bd1a2ef7ed00fa16810ff170b371707e
--- 1/include/configs/ls1021aiot.h
--- 2/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@@ -215,6 -215,10 +215,6 @@@
  #define CONFIG_CMDLINE_TAG
  #define CONFIG_CMDLINE_EDITING
  
 -#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT)
 -#undef        CONFIG_CMD_IMLS
 -#endif
 -
  #define CONFIG_PEN_ADDR_BIG_ENDIAN
  #define CONFIG_LAYERSCAPE_NS_ACCESS
  #define CONFIG_SMP_PEN_ADDR           0x01ee0200
@@@ -276,7 -280,6 +276,6 @@@
  
  #define CONFIG_OF_BOARD_SETUP
  #define CONFIG_OF_STDOUT_VIA_ALIAS
- #define CONFIG_CMD_BOOTZ
  
  #define CONFIG_MISC_INIT_R