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>

A9M2440: Use external GPIO settings to setup the SDRAM ...

The generic A9M2440 comes in many SDRAM variantes. Two GPIO pins describing
the populated SDRAM devices. This patch adds some code to query the setting
and setup a correct SDRAM configuration out of four possible variants.

Due to the lack of hardware the 16 MiB and 128 MiB case is untested yet.

Due to the 32 MiB configuration we must link the u-boot-v2 always to
address 0x31fc0000. Even for the 64 MiB and 128 MiB configuration.

Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de>

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

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

Add the basic support for the DIGI a9m2440 CPU card. ...

Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>