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

Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.

Conflicts:
	arch/arm/dts/exynos5250.dtsi

Signed-off-by: Tom Rini <trini@ti.com>

2013-07-12 10:36:48 -04:00

..

bddb

…

buildman

buildman: Produce a sensible error message when branch is missing

2013-05-14 15:37:58 -04:00

easylogo

…

env

env: Add redundant env support to UBI env

2013-04-11 15:52:55 -04:00

gdb

…

imls

treewide: include libfdt_env.h before fdt.h

2013-02-07 20:38:55 -05:00

kernel-doc

kerneldoc: Implement "Example" section handling

2012-10-15 11:54:15 -07:00

logos

wandboard: Add Boot Splash image with Wandboard logo

2013-06-03 14:26:22 +02:00

omap

…

palmtreo680

pxa: palmtreo680 flash programming utility

2013-06-22 15:25:28 +02:00

patman

buildman: Produce a sensible error message when branch is missing

2013-05-14 15:37:58 -04:00

scripts

autoconfig.mk: Make it possible to define configs from other configs

2013-04-12 07:55:06 +02:00

updater

…

.gitignore

Add proftool to decode profile data

2013-06-26 10:16:41 -04:00

aisimage.c

mkimage: Move ARRAY_SIZE to header file

2013-05-14 15:37:24 -04:00

aisimage.h

…

bin2header.c

…

binutils-version.sh

tools, config.mk: add binutils-version

2012-10-04 14:18:54 +02:00

bmp_logo.c

…

checkpatch.pl

checkpatch.pl: Add 'printf' to logFunctions

2013-06-06 09:28:19 -04:00

checkstack.pl

…

cleanpatch

tools: Add cleanpatch

2012-10-15 11:54:04 -07:00

default_image.c

…

envcrc.c

…

fdt_host.h

treewide: include libfdt_env.h before fdt.h

2013-02-07 20:38:55 -05:00

fit_image.c

mkimage: Add -r option to specify keys that must be verified

2013-06-26 10:18:56 -04:00

gcc-version.sh

…

gen_eth_addr.c

…

getline.c

…

getline.h

…

image-host.c

image: Add support for signing of FIT configurations

2013-06-26 10:18:56 -04:00

img2brec.sh

…

img2srec.c

…

imximage.c

imx: Align the imximage header and payload to multiples of 4k

2013-05-05 17:45:04 +02:00

imximage.h

imx: Align the imximage header and payload to multiples of 4k

2013-05-05 17:45:04 +02:00

jtagconsole

…

kwbimage.c

…

kwbimage.h

…

kwboot.c

…

Makefile

mkimage: Build signing only if board has CONFIG_FIT_SIGNATURE

2013-06-28 16:26:52 -04:00

mingw_support.c

…

mingw_support.h

tools: clean up mingw ifdefs

2012-07-20 08:53:34 +02:00

mkenvimage.c

tools: clean up mingw ifdefs

2012-07-20 08:53:34 +02:00

mkexynosspl.c

…

mkimage.c

mkimage: Add -r option to specify keys that must be verified

2013-06-26 10:18:56 -04:00

mkimage.h

mkimage: Add -r option to specify keys that must be verified

2013-06-26 10:18:56 -04:00

mpc86x_clk.c

…

mxsboot.c

mxs: mxsboot: Move sdcard BCB header to 4 sectors offset

2013-04-26 09:16:48 +02:00

ncb.c

…

netconsole

net: Make netconsole src and dest ports configurable

2012-09-24 13:17:24 -05:00

omapimage.c

omapimage: Add support for byteswapped SPI images

2012-10-25 11:30:50 -07:00

omapimage.h

…

os_support.c

…

os_support.h

…

pblimage.c

powerpc/CoreNet: Allow pbl images to take u-boot images != 512K

2013-06-20 17:08:52 -05:00

pblimage.h

powerpc/CoreNet: add tool to support pbl image build.

2012-08-23 10:24:16 -05:00

proftool.c

tools/proftool: remove REG_NOERROR

2013-07-03 09:35:37 -04:00

setlocalversion

…

ublimage.c

…

ublimage.h

…

ubsha1.c

…

xway-swap-bytes.c

…