From: Tom Rini <trini@ti.com>
Date: Fri, 30 Jan 2015 14:24:42 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-dm
X-Git-Tag: KARO-TXA5-2015-06-26~38^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8e3da9dd113699eed2fa05fcde3c55a2ff410913;hp=-c;p=karo-tx-uboot.git

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

8e3da9dd113699eed2fa05fcde3c55a2ff410913
diff --combined README
index a11e74aff1,cac7978afa..a28ff133ee
--- a/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 d8618962fb,dcbc72fc1e..0e6af00c16
--- a/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 cb44456cbd,ea76a3e7d9..6e1ce79f2f
--- a/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