Merge remote-tracking branch 'u-boot/master'

Conflicts:
boards.cfg

Conflicts were trivial once u-boot-arm/master boards.cfg was
reformatted (commit 6130c146) to match u-boot/master's own
reformatt

Merge remote-tracking branch 'u-boot/master'

Conflicts:
boards.cfg

Conflicts were trivial once u-boot-arm/master boards.cfg was
reformatted (commit 6130c146) to match u-boot/master's own
reformatting (commit 1b37fa83).

show more ...

Merge remote-tracking branch 'u-boot/master' into test

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

powerpc/85xx: Add T4240RDB board support

T4240RDB board Specification
----------------------------
Memory subsystem:
6GB DDR3
128MB NOR flash
2GB NAND flash

Ethernet:
Eight 1G SGMII por

powerpc/85xx: Add T4240RDB board support

T4240RDB board Specification
----------------------------
Memory subsystem:
6GB DDR3
128MB NOR flash
2GB NAND flash

Ethernet:
Eight 1G SGMII ports
Four 10Gbps SFP+ ports

PCIe:
Two PCIe slots

USB:
Two USB2.0 Type A ports

SDHC:
One SD-card port

SATA:
One SATA port

UART:
Dual RJ45 ports

Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com>
[York Sun: fix CONFIG_SYS_QE_FMAN_FW_ADDR in T4240RDB.h]

show more ...