u-boot.git/tools, branch v2013.07-rc1

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

2013-06-13T19:16:15Z

Small conflict over DRA7XX updates and adding SRAM_SCRATCH_SPACE_ADDR Conflicts: arch/arm/include/asm/arch-omap5/omap.h Signed-off-by: Tom Rini

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

2013-06-08T12:35:10Z

Conflicts: drivers/serial/Makefile

checkpatch.pl: Add 'printf' to logFunctions

2013-06-06T13:28:19Z

Signed-off-by: Tom Rini

mkimage: Add map_sysmem() and IH_ARCH_DEFAULT to simplfy building

2013-06-04T20:06:31Z

These are not actually used in mkimage itself, but the image code (which is common with mkimage) does use them. To avoid #ifdefs in the image code just for mkimage, define dummy version of these here. The compiler will eliminate the dead code anyway. A better way to handle this might be to split out more things from common.h so that mkimage can include them. At present any file that mkimage uses has to be very careful what headers it includes. Signed-off-by: Simon Glass

wandboard: Add Boot Splash image with Wandboard logo

2013-06-03T12:26:22Z

Signed-off-by: Otavio Salvador

build: Use generic boot logo matching

2013-06-03T12:18:28Z

The boot logo matching is now done in following way: - use LOGO_BMP if it is set, or - use $(BOARD).bmp if it exists in tools/logos, or - use $(VENDOR).bmp if it exists in tools/logos, or - use denx.bmp otherwise. Signed-off-by: Otavio Salvador Acked-by: Wolfgang Denk

Merge branch 'u-boot/master' into 'u-boot-arm/master'

2013-05-30T12:45:06Z

Conflicts: common/cmd_fpga.c drivers/usb/host/ohci-at91.c

buildman: Produce a sensible error message when branch is missing

2013-05-14T19:37:58Z

Rather than a backtrace, produce a nice error message when an invalid branch is provided to buildman. Signed-off-by: Simon Glass

mkimage: Put FIT loading in function and tidy error handling

2013-05-14T19:37:25Z

The fit_handle_file() function is quite long - split out the part that loads and checks a FIT into its own function. We will use this function for storing public keys into a destination FDT file. The error handling is currently a bit repetitive - tidy it. Signed-off-by: Simon Glass

image: Rename fit_add_hashes() to fit_add_verification_data()

2013-05-14T19:37:25Z

We intend to add signatures to FITs also, so rename this function so that it is not specific to hashing. Also rename fit_image_set_hashes() and make it static since it is not used outside this file. Signed-off-by: Simon Glass Reviewed-by: Marek Vasut