Merge branch 'net' into next

mx25 3ds: fix memory initialization ...

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mx25 3ds: fix fec initialization ...

The fec network interface initialization depends on the initialization of the
PMIC. Once the MC34704 driver is registered we can enable the PHY power supply,
and go on with the PHY initialization.

While we are at it convert the hard-coded GPIO registers access to the general
GPIO API for shorter and clearer code.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mx25 3ds: add support for i2c master and PMIC ...

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mx25 3ds: fix build failure ...

Remove redundant parameters from the imx_nand_load_image() call.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

freescale-mx*5-3-stack : fix __flash_header_start ...

_start is now exception_vectors since it was rewritten in C
(not tested on these boards but compile should fail without
this patch)

Signed-off-by: Eric Benard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

MX25PDK: Add support for 64MiB DDR2 SDRAM ...

Newer Freescale 3-Stack development systems are equipped
with 64MiB of DDR2 SDRAM, instead of the 128MiB of mDDR SDRAM
with which earlier versions were shipped.

Signed-off-by: Ivo Clarysse <ivo.clarysse@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

i.MX25 3stack: fixup flash header to new names/layout ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

rename U-Boot-v2 project to barebox ...

This has been done with the following script:

find -path ./.git -prune -o -type f -print0 | xargs -0 -r sed -i \
	-e 's/u2boot/barebox/g' \
	-e 's/U2Boot/barebox/g' \
	-e 's/U-boot V2/barebox/g' \
	-e 's/u-boot v2/barebox/g' \
	-e 's/U-Boot V2/barebox/g' \
	-e 's/U-Boot-v2/barebox/g' \
	-e 's/U_BOOT/BAREBOX/g' \
	-e 's/UBOOT/BAREBOX/g' \
	-e 's/uboot/barebox/g' \
	-e 's/u-boot/barebox/g' \
	-e 's/u_boot/barebox/g' \
	-e 's/U-Boot/barebox/g' \
	-e 's/U-boot/barebox/g' \
	-e 's/U-BOOT/barebox/g'

find -path ./.git -prune -o \( -name "*u-boot*" -o -name "*uboot*" -o -name "*u_boot*" \) -print0 | \
	xargs -0 -r rename 's/u[-_]?boot/barebox/'

It needs some manual fixup following in the next patch

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mx25-3stack, pcm043: use IMX_FEC_BASE define ...

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

Merge branch 'for-sascha' of git://uboot.jcrosoft.org/u-boot-v2 into from-jean ...

Conflicts:
	board/a9m2440/a9m2440.c
	board/pcm043/pcm043.c
	drivers/nand/nand_imx.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

IMX_NAND_BASE -> IMX_NFC_BASE ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach ...

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

add Freescale MX25 3stack board support ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>