ARM: i.MX: remove now unused image-y from Makefile.imx ...

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

i2c-omap: fix reported revison ...

Report correct major and minor revision
Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/tegra' ...

Conflicts:
	arch/arm/dts/Makefile
	images/Makefile

Merge branch 'for-next/socfpga' ...

Conflicts:
	scripts/Makefile

Merge branch 'for-next/rs485' ...

Conflicts:
	common/console_common.c

Merge branch 'for-next/omap'

Merge branch 'for-next/net' ...

Conflicts:
	arch/arm/boards/animeo_ip/init.c

Merge branch 'for-next/mxs'

Merge branch 'for-next/mount'

Merge branch 'for-next/misc' ...

Conflicts:
	commands/Makefile

Merge branch 'for-next/mips'

Merge branch 'for-next/mci'

Merge branch 'for-next/lzo'

Merge branch 'for-next/login' ...

Conflicts:
	include/console.h

Merge branch 'for-next/gpio'

Merge branch 'for-next/fs' ...

Conflicts:
	fs/Kconfig
	fs/Makefile

Merge branch 'for-next/console'

Merge branch 'for-next/bpkfs'

Merge branch 'for-next/bootm'

Merge branch 'for-next/at91'

Merge branch 'for-next/arm'

dhcp: replace dhcp_getenv_int with getenv_uint ...

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

bootm: Replace getenv_loadaddr with getenv_ul ...

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

Release v2013.10.0 ...

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

macb: add support to read the mac address from register ...

check the 4 mac address register and return at the first valid

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

fs: add BPKFS support ...

Simple update file format developed for Somfy, tools and library are
available under LGPLv2 (https://www.gitorious.org/libbpk).

This format in the v1.0 allow you to store 6 types a binary stream for
a unique hardware id:
 - bootloader
 - bootloader_version
 - description.gz
 - kernel
 - rootfs
 - firmware_version

and you can easly add more binary stream type.

The fs will display you in a directory per hw id

and if a binary stream type is unknown will be display
as unknown_%08x

 # mount image.bpk /tmp
 # ls -l /tmp/hw_id_0/
-rwxrwxrwx         10 firmware_version
-rwxrwxrwx          8 firmware_version.crc
-rwxrwxrwx    1845968 kernel
-rwxrwxrwx          8 kernel.crc
-rwxrwxrwx    5062656 rootfs
-rwxrwxrwx          8 rootfs.crc
-rwxrwxrwx        248 bootloader
-rwxrwxrwx          8 bootloader.crc
-rwxrwxrwx     248925 description.gz
-rwxrwxrwx          8 description.gz.crc
-rwxrwxrwx          4 bootloader_version
-rwxrwxrwx          8 bootloader_version.crc
-rwxrwxrwx          4 unknown_1234567g
-rwxrwxrwx          8 unknown_1234567g.crc

Why BPK and not CPIO or uImage

1) CPIO

cpio does not handle > 4GiB image and does not have any crc checksum

2) uImage

uImage only provide one crc32 for the all data part and only a list of binary
stream with no information about what is what (in multi-image format)

3) BPK

BPK provide a crc32 for the header part and one crc32 per binary stream
so if you does not care of some data you are not force to check them

And you known exactly the binary stream type and for which hw to
use it.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Fargier Sylvain <sylvain.fargier@somfy.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

filetype: add Binary PacKage BPK type ...

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

console: factorise function to get the first enabled console ...

rename it to console_get_first_active

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

beaglebone: use most recent timings for white variant ...

These values come from the U-Boot source code.

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

arm: omap: am33xx_generic: fix DDR setup for DDR2 ...

For DDR2 RAMs, regs->zq_config is not used, which causes the
AM33XX_EMIF4_0_REG(SDRAM_CONFIG) register to be left unconfigured, resulting
in boot failure.

It seems that the DDR2 case was missed during the consolidation in commit
9f122f8. The actual call for the Bone was
removed in 88659d9.

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