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

diff --combined arch/arm/Kconfig
index 1f3fa1575a31e95022573c65d928fd999a1b0a5a,d6b189af58855649e88adab52a22c848ffd6a652..2899a60793c6748924e60d00869f63b9d6cc5a6a
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -807,6 -807,7 +807,6 @@@ config ARCH_SOCFPG
        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 if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
        imply CMD_DM
@@@ -816,7 -817,6 +816,7 @@@
        imply DM_SPI_FLASH
        imply FAT_WRITE
        imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
 +      imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE
  
  config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
@@@ -848,6 -848,7 +848,7 @@@
        imply CMD_UBI if NAND
        imply DISTRO_DEFAULTS
        imply FAT_WRITE
+       imply FIT
        imply OF_LIBFDT_OVERLAY
        imply PRE_CONSOLE_BUFFER
        imply SPL_GPIO_SUPPORT