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

diff --combined README
index a11e74aff1b923f3c7cd8381305c32640a61a28e,cac7978afac081129cb0355d9487c674fcd6c6af..a28ff133ee057c17af79a397e44325328f82dedf
--- 1/README
--- 2/README
+++ b/README
@@@ -3176,8 -3176,13 +3176,13 @@@ CBFS (Coreboot Filesystem) suppor
                This enables the RSA algorithm used for FIT image verification
                in U-Boot. See doc/uImage.FIT/signature.txt for more information.
  
+               The Modular Exponentiation algorithm in RSA is implemented using
+               driver model. So CONFIG_DM needs to be enabled by default for this
+               library to function.
+ 
                The signing part is build into mkimage regardless of this
-               option.
+               option. The software based modular exponentiation is built into
+               mkimage irrespective of this option.
  
  - bootcount support:
                CONFIG_BOOTCOUNT_LIMIT
@@@ -5899,10 -5904,9 +5904,10 @@@ option performs the converse operation 
  option). Given an image built by mkimage, the dumpimage extracts a "data file"
  from the image:
  
 -      tools/dumpimage -i image -p position data_file
 -        -i ==> extract from the 'image' a specific 'data_file', \
 -         indexed by 'position'
 +      tools/dumpimage -i image -T type -p position data_file
 +        -i ==> extract from the 'image' a specific 'data_file'
 +        -T ==> set image type to 'type'
 +        -p ==> 'position' (starting at 0) of the 'data_file' inside the 'image'
  
  
  Installing a Linux Image:

diff --combined include/image.h
index d8618962fb2a23ce69435201ed154f0f8a8bbda8,dcbc72fc1e23ede7be23addbb32dda2c8cee8803..0e6af00c16bbab07a7c1284bca9963b0a4f2155c
--- 1/include/image.h
--- 2/include/image.h
+++ b/include/image.h
@@@ -751,7 -751,6 +751,7 @@@ int fit_parse_conf(const char *spec, ul
  int fit_parse_subimage(const char *spec, ulong addr_curr,
                ulong *addr, const char **image_name);
  
 +int fit_get_subimage_count(const void *fit, int images_noffset);
  void fit_print_contents(const void *fit);
  void fit_image_print(const void *fit, int noffset, const char *p);
  
@@@ -928,8 -927,9 +928,9 @@@ struct checksum_algo 
  #if IMAGE_ENABLE_SIGN
        const EVP_MD *(*calculate_sign)(void);
  #endif
-       void (*calculate)(const struct image_region region[],
-                         int region_count, uint8_t *checksum);
+       int (*calculate)(const char *name,
+                        const struct image_region region[],
+                        int region_count, uint8_t *checksum);
        const uint8_t *rsa_padding;
  };
  

diff --combined tools/Makefile
index cb44456cbd82f31c50e6fa6b7a217d3b360bb699,ea76a3e7d9f043ac631bc1778e989db479870407..6e1ce79f2f45cd33cc3e99ca278a330adb0f75bd
--- 1/tools/Makefile
--- 2/tools/Makefile
+++ b/tools/Makefile
@@@ -60,7 -60,8 +60,8 @@@ FIT_SIG_OBJS-$(CONFIG_FIT_SIGNATURE) :
  LIBFDT_OBJS := $(addprefix lib/libfdt/, \
                        fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_wip.o)
  RSA_OBJS-$(CONFIG_FIT_SIGNATURE) := $(addprefix lib/rsa/, \
-                                       rsa-sign.o rsa-verify.o rsa-checksum.o)
+                                       rsa-sign.o rsa-verify.o rsa-checksum.o \
+                                       rsa-mod-exp.o)
  
  # common objs for dumpimage and mkimage
  dumpimage-mkimage-objs := aisimage.o \
@@@ -90,6 -91,7 +91,7 @@@
                        socfpgaimage.o \
                        lib/sha1.o \
                        lib/sha256.o \
+                       common/hash.o \
                        ublimage.o \
                        $(LIBFDT_OBJS) \
                        $(RSA_OBJS-y)
@@@ -122,8 -124,6 +124,8 @@@ HOSTLOADLIBES_dumpimage := $(HOSTLOADLI
  HOSTLOADLIBES_fit_info := $(HOSTLOADLIBES_mkimage)
  HOSTLOADLIBES_fit_check_sign := $(HOSTLOADLIBES_mkimage)
  
 +HOSTLDFLAGS += -T $(srctree)/tools/imagetool.lds
 +
  hostprogs-$(CONFIG_EXYNOS5250) += mkexynosspl
  hostprogs-$(CONFIG_EXYNOS5420) += mkexynosspl
  HOSTCFLAGS_mkexynosspl.o := -pedantic