Merge branch 'master' of /home/wd/git/u-boot/master/

Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

Flash programming progress countdown.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>

Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

Conflicts:

drivers/rtc/Makefile

Signed-off-by: Wolfgang Denk <wd@denx.de>

Add support for Intersil isl1208 RTC

Signed-off-by: Tor Krill <tor@excito.com>

[new uImage] Add new uImage format documentation and examples

Create doc/uImage.FIT documentation directory with the following files:
- command_syntax_extensions.txt : extended command syntax descri

[new uImage] Add new uImage format documentation and examples

Create doc/uImage.FIT documentation directory with the following files:
- command_syntax_extensions.txt : extended command syntax description
- howto.txt : short usage howto
- source_file_format.txt : internal new uImage format description

Add example image source files:
- kernel.its
- kernel_fdt.its
- multi.its

Update README appropriately.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>

show more ...

[new uImage] Add proper ramdisk/FDT handling when FIT configuration is used

Save FIT configuration provied in the first bootm argument and use it
when to get ramdisk/FDT subimages when second and th

[new uImage] Add proper ramdisk/FDT handling when FIT configuration is used

Save FIT configuration provied in the first bootm argument and use it
when to get ramdisk/FDT subimages when second and third (ramdisk/FDT)
arguments are not specified.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>

show more ...

[new uImage] Use show_boot_progress() for new uImage format

This patch allocates a set of show_boot_progress() IDs for new uImage format
and adds show_boot_progress() calls in new uImage format hand

[new uImage] Use show_boot_progress() for new uImage format

This patch allocates a set of show_boot_progress() IDs for new uImage format
and adds show_boot_progress() calls in new uImage format handling code.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>

show more ...

Merge branch 'master' of /home/git/u-boot

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

Conflicts:

Makefile
doc/README.standalone

Signed-off-by: Wolfgang Denk <wd@denx.de>

PPC: Use r2 instead of r29 as global data pointer

R29 was an unlucky choice as with recent toolchains (gcc-4.2.x) gcc
will refuse to use load/store multiple insns; instead, it issues a
list of simpl

PPC: Use r2 instead of r29 as global data pointer

R29 was an unlucky choice as with recent toolchains (gcc-4.2.x) gcc
will refuse to use load/store multiple insns; instead, it issues a
list of simple load/store instructions upon function entry and exit,
resulting in bigger code size, which in turn makes the build for a
few boards fail.

Use r2 instead.

Signed-off-by: Wolfgang Denk <wd@denx.de>

show more ...

add some more Blackfin docs

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

Merge ../custodians

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

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

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

IXP: add dynamic microcode addr

allow to load the microde from flash or ram by download it through
the serial or other.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked

IXP: add dynamic microcode addr

allow to load the microde from flash or ram by download it through
the serial or other.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Stefan Roese <sr@denx.de>

show more ...

ColdFire: MCF547x_8x - Add M5475EVB and M5485EVB support

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: Add MCF5227x cpu and M52277EVB support-1

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

Add support for a Freescale non-CPM SPI controller

This patch adds support for the SPI controller found on Freescale PowerPC
processors such as the MCP834x family. Additionally, a new config option

Add support for a Freescale non-CPM SPI controller

This patch adds support for the SPI controller found on Freescale PowerPC
processors such as the MCP834x family. Additionally, a new config option,
CONFIG_HARD_SPI, is added for general purpose SPI controller use.

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

show more ...

net: add 'ethrotate' environment variable

[PATCH] net: add 'ethrotate' environment variable

This patch replaces the buildtime configuration option
CONFIG_NET_DO_NOT_TRY_ANOTHER through the 'ethrota

net: add 'ethrotate' environment variable

[PATCH] net: add 'ethrotate' environment variable

This patch replaces the buildtime configuration option
CONFIG_NET_DO_NOT_TRY_ANOTHER through the 'ethrotate' runtime
configuration veriable. See README.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

show more ...

Merge branch 'master' of /home/stefan/git/u-boot/u-boot

Enable SMC microcode relocation patch for SMC1.

Signed-off-by: Heiko Schocher <hs@denx.de>

Merge commit 'wd/master'

fix comments with new drivers organization

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>