diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-30 14:45:06 +0200 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-30 14:45:06 +0200 | 
| commit | a19b0dd62d7b8efc658fa1aa685ff5665878f3ee (patch) | |
| tree | 1fadf0fb3da83203ba28f209ec99e1b33e03f4d5 /tools/mkimage.h | |
| parent | 60985bba58e7695dac1fddae8cdbb62d8cfd1254 (diff) | |
| parent | a71d45d706a5b51c348160163b6c159632273fed (diff) | |
| download | olio-uboot-2014.01-a19b0dd62d7b8efc658fa1aa685ff5665878f3ee.tar.xz olio-uboot-2014.01-a19b0dd62d7b8efc658fa1aa685ff5665878f3ee.zip | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
	common/cmd_fpga.c
	drivers/usb/host/ohci-at91.c
Diffstat (limited to 'tools/mkimage.h')
| -rw-r--r-- | tools/mkimage.h | 2 | 
1 files changed, 2 insertions, 0 deletions
| diff --git a/tools/mkimage.h b/tools/mkimage.h index ea45f5c83..e07a6157e 100644 --- a/tools/mkimage.h +++ b/tools/mkimage.h @@ -42,6 +42,8 @@  #define debug(fmt,args...)  #endif /* MKIMAGE_DEBUG */ +#define ARRAY_SIZE(x)		(sizeof(x) / sizeof((x)[0])) +  #define MKIMAGE_TMPFILE_SUFFIX		".tmp"  #define MKIMAGE_MAX_TMPFILE_LEN		256  #define MKIMAGE_DEFAULT_DTC_OPTIONS	"-I dts -O dtb -p 500" |