Merge git://git.denx.de/u-boot-dm

diff --cc cmd/disk.c
index 106f2d1a3b50a17c562a64e334987f2096beacce,e0219f810e381d0dcd6584903b787ec7d38a80c1..2fd1717e6a44680107f2c242ab29855a9baaad41
--- 1/cmd/disk.c
--- 2/cmd/disk.c
+++ b/cmd/disk.c
@@@ -20,9 -20,9 +20,9 @@@ int common_diskboot(cmd_tbl_t *cmdtp, c
  #if defined(CONFIG_IMAGE_FORMAT_LEGACY)
        image_header_t *hdr;
  #endif
-       block_dev_desc_t *dev_desc;
+       struct blk_desc *dev_desc;
  
 -#if defined(CONFIG_FIT)
 +#if CONFIG_IS_ENABLED(FIT)
        const void *fit_hdr = NULL;
  #endif
  

diff --cc common/spl/spl_mmc.c
Simple merge

diff --cc include/common.h
Simple merge

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

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

diff --cc include/spl.h
Simple merge