u-boot.git/include/configs, branch v2014.01-rc2 Unnamed repository; edit this file 'description' to name the repository. Merge branch 'master' of git://git.denx.de/u-boot-blackfin 2013-12-16T14:13:25+00:00 Tom Rini trini@ti.com 2013-12-16T14:13:25+00:00 93b7b7fdadbbdcfacffab30a972774fa9ef8afb5 






blackfin: fix building error by enlarging the memory size
2013-12-16T03:38:32+00:00

Sonic Zhang
sonic.zhang@analog.com

2013-12-09T04:45:29+00:00

6e6b221c4375399625a956ecb8814d176871ef19

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>





Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>







blackfin: Disable commands to reduce l1 ram requirement
2013-12-16T03:38:32+00:00

Sonic Zhang
sonic.zhang@analog.com

2013-12-09T04:38:56+00:00

a2d169087ed5c0e82356445f5f29cdd9b6c3420e

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>





Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>







blackfin: fix building error by adding macro CONFIG_SYS_I2C
2013-12-16T03:38:32+00:00

Sonic Zhang
sonic.zhang@analog.com

2013-12-09T04:21:07+00:00

fa88d88f82cb8e986c07e870c80eba4873ec0cf8

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>





Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>







blackfin: fix build error by adding CONFIG_BFIN_SERIAL
2013-12-16T03:38:32+00:00

Sonic Zhang
sonic.zhang@analog.com

2013-12-09T04:19:38+00:00

7b27a685bfc9abb58d6df843263decfe1be2ac35

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>





Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>







kgdb: configs: remove obsolete CONFIG_KGDB_SER_INDEX
2013-12-13T14:15:32+00:00

Vladimir Zapolskiy
vz@mleia.com

2013-12-01T18:07:28+00:00

2c808a12ea7e00d5078e57a9640adcb0504c739c

The last users of CONFIG_KGDB_SER_INDEX were removed more than 3 years
ago in commits 550650ddd0 and bf16500f79, either kgdb subsystem should
care about this parameter or it should be gone completely.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>





The last users of CONFIG_KGDB_SER_INDEX were removed more than 3 years
ago in commits 550650ddd0 and bf16500f79, either kgdb subsystem should
care about this parameter or it should be gone completely.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>







Merge branch 'master' of git://git.denx.de/u-boot-arm
2013-12-10T22:15:18+00:00

Tom Rini
trini@ti.com

2013-12-10T22:15:18+00:00

4b210ad34282bfd9fc982a8e3c9a9126f4094cdb

Conflicts:
	board/samsung/trats2/trats2.c
	include/configs/exynos5250-dt.h

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





Conflicts:
	board/samsung/trats2/trats2.c
	include/configs/exynos5250-dt.h

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







Merge branch 'u-boot/master' into 'u-boot-arm/master'
2013-12-10T21:23:59+00:00

Albert ARIBAUD
albert.u.boot@aribaud.net

2013-12-10T13:31:56+00:00

f15ea6e1d67782a1626d4a4922b6c20e380085e5

Conflicts:
	arch/arm/cpu/armv7/rmobile/Makefile
	doc/README.scrapyard

Needed manual fix:
	arch/arm/cpu/armv7/omap-common/Makefile
	board/compulab/cm_t335/u-boot.lds





Conflicts:
	arch/arm/cpu/armv7/rmobile/Makefile
	doc/README.scrapyard

Needed manual fix:
	arch/arm/cpu/armv7/omap-common/Makefile
	board/compulab/cm_t335/u-boot.lds







Merge branch 'spi' of git://git.denx.de/u-boot-x86
2013-12-10T14:36:23+00:00

Tom Rini
trini@ti.com

2013-12-10T14:36:23+00:00

65b7fe28a12bbaccc7a0c076f5f9f213150030e7












Merge branch 'master' of git://git.denx.de/u-boot-i2c
2013-12-10T14:29:45+00:00

Tom Rini
trini@ti.com

2013-12-10T14:29:45+00:00

76a8265b4f54d1b9cd2b70efb46dcdeaa5d20bfb