Merge branch 'master' of git://git.denx.de/u-boot-socfpga

diff --combined arch/arm/Kconfig
index 923fa49735bb045b45516b9b7a8ab7a9b8d0d32d,2012ac64105e1ad523034ce3b46bb71f43398d1d..3e05f79f638cd4d3c4a3b6bdde59b59efd5efd3f
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -497,6 -497,13 +497,6 @@@ config TARGET_X60
        select SUPPORT_SPL
        select PL011_SERIAL
  
 -config TARGET_MX31PDK
 -      bool "Support mx31pdk"
 -      select BOARD_LATE_INIT
 -      select CPU_ARM1136
 -      select SUPPORT_SPL
 -      select BOARD_EARLY_INIT_F
 -
  config TARGET_WOODBURN
        bool "Support woodburn"
        select CPU_ARM1136
@@@ -658,10 -665,6 +658,10 @@@ config ARCH_MX2
        select PL011_SERIAL
        select SUPPORT_SPL
  
 +config ARCH_MX31
 +      bool "NXP i.MX31 family"
 +      select CPU_ARM1136
 +
  config ARCH_MX7ULP
          bool "NXP MX7ULP"
        select CPU_V7A
@@@ -730,14 -733,27 +730,27 @@@ config ARCH_SNAPDRAGO
  
  config ARCH_SOCFPGA
        bool "Altera SOCFPGA family"
+       select ARCH_EARLY_INIT_R
+       select ARCH_MISC_INIT
        select CPU_V7A
-       select SUPPORT_SPL
-       select OF_CONTROL
-       select SPL_OF_CONTROL
        select DM
+       select DM_SERIAL
        select ENABLE_ARM_SOC_BOOT0_HOOK
-       select ARCH_EARLY_INIT_R
-       select ARCH_MISC_INIT
+       select OF_CONTROL
+       select SPL_LIBCOMMON_SUPPORT
+       select SPL_LIBDISK_SUPPORT
+       select SPL_LIBGENERIC_SUPPORT
+       select SPL_MMC_SUPPORT if DM_MMC
+       select SPL_NAND_SUPPORT if SPL_NAND_DENALI
+       select SPL_OF_CONTROL
+       select SPL_SERIAL_SUPPORT
+       select SPL_DM_SERIAL
+       select SPL_SPI_FLASH_SUPPORT if SPL_SPI_SUPPORT
+       select SPL_SPI_SUPPORT if DM_SPI
+       select SPL_WATCHDOG_SUPPORT
+       select SUPPORT_SPL
+       select SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE
+       select SYS_NS16550
        select SYS_THUMB_BUILD
        imply CMD_MTDPARTS
        imply CRC32_VERIFY
@@@ -1302,8 -1318,6 +1315,8 @@@ source "arch/arm/cpu/armv7/ls102xa/Kcon
  
  source "arch/arm/mach-imx/mx2/Kconfig"
  
 +source "arch/arm/mach-imx/mx3/Kconfig"
 +
  source "arch/arm/mach-imx/mx5/Kconfig"
  
  source "arch/arm/mach-imx/mx6/Kconfig"
@@@ -1391,6 -1405,7 +1404,6 @@@ source "board/freescale/ls1046ardb/Kcon
  source "board/freescale/ls1012aqds/Kconfig"
  source "board/freescale/ls1012ardb/Kconfig"
  source "board/freescale/ls1012afrdm/Kconfig"
 -source "board/freescale/mx31pdk/Kconfig"
  source "board/freescale/mx35pdk/Kconfig"
  source "board/freescale/s32v234evb/Kconfig"
  source "board/gdsys/a38x/Kconfig"

diff --combined arch/arm/dts/Makefile
index b3a240590f43160d8ba33e8c5e9891d12b467790,2af94da65040d3910b1fcdf0d14cab302ffd4c48..a0349a89753afc16442596918a38e5ca83501f59
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -183,20 -183,20 +183,20 @@@ dtb-$(CONFIG_TI816X) += dm8168-evm.dt
  dtb-$(CONFIG_THUNDERX) += thunderx-88xx.dtb
  
  dtb-$(CONFIG_ARCH_SOCFPGA) +=                         \
-       socfpga_arria10_socdk_sdmmc.dtb                 \
        socfpga_arria5_socdk.dtb                        \
+       socfpga_arria10_socdk_sdmmc.dtb                 \
        socfpga_cyclone5_is1.dtb                        \
        socfpga_cyclone5_mcvevk.dtb                     \
        socfpga_cyclone5_socdk.dtb                      \
        socfpga_cyclone5_dbm_soc1.dtb                   \
-       socfpga_cyclone5_de0_nano_soc.dtb                       \
+       socfpga_cyclone5_de0_nano_soc.dtb               \
        socfpga_cyclone5_de1_soc.dtb                    \
        socfpga_cyclone5_de10_nano.dtb                  \
        socfpga_cyclone5_sockit.dtb                     \
        socfpga_cyclone5_socrates.dtb                   \
        socfpga_cyclone5_sr1500.dtb                     \
-       socfpga_stratix10_socdk.dtb                     \
-       socfpga_cyclone5_vining_fpga.dtb
+       socfpga_cyclone5_vining_fpga.dtb                \
+       socfpga_stratix10_socdk.dtb
  
  dtb-$(CONFIG_TARGET_DRA7XX_EVM) += dra72-evm.dtb dra7-evm.dtb \
        dra72-evm-revc.dtb dra71-evm.dtb dra76-evm.dtb
@@@ -400,33 -400,24 +400,33 @@@ dtb-$(CONFIG_VF610) += vf500-colibri.dt
  
  dtb-$(CONFIG_MX53) += imx53-cx9020.dtb
  
 -dtb-$(CONFIG_MX6) += imx6ull-14x14-evk.dtb \
 -      imx6sl-evk.dtb \
 -      imx6sll-evk.dtb \
 +dtb-$(CONFIG_MX6QDL) += \
        imx6dl-icore.dtb \
        imx6dl-icore-mipi.dtb \
        imx6dl-icore-rqs.dtb \
 +      imx6dl-mamoj.dtb \
        imx6q-cm-fx6.dtb \
        imx6q-icore.dtb \
        imx6q-icore-mipi.dtb \
        imx6q-icore-rqs.dtb \
 -      imx6q-logicpd.dtb \
 +      imx6q-logicpd.dtb
 +
 +dtb-$(CONFIG_MX6SL) += imx6sl-evk.dtb
 +
 +dtb-$(CONFIG_MX6SL) += imx6sll-evk.dtb
 +
 +dtb-$(CONFIG_MX6SX) += \
        imx6sx-sabreauto.dtb \
 -      imx6sx-sdb.dtb \
 +      imx6sx-sdb.dtb
 +
 +dtb-$(CONFIG_MX6UL) += \
        imx6ul-geam-kit.dtb \
        imx6ul-isiot-emmc.dtb \
        imx6ul-isiot-nand.dtb \
        imx6ul-opos6uldev.dtb
  
 +dtb-$(CONFIG_MX6ULL) += imx6ull-14x14-evk.dtb
 +
  dtb-$(CONFIG_MX7) += imx7-colibri.dtb \
        imx7d-sdb.dtb