u-boot.git/drivers/mtd, branch v2013.04 Unnamed repository; edit this file 'description' to name the repository. Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-04-15T11:46:11+00:00 Tom Rini trini@ti.com 2013-04-15T11:46:11+00:00 17059f972fa6768ebf15a575c00083b3a431b79a 






Merge branch 'u-boot/master' into 'u-boot-arm/master'
2013-04-12T20:07:57+00:00

Albert ARIBAUD
albert.u.boot@aribaud.net

2013-04-12T20:07:57+00:00

18122019972ca639ee3b581257e3a63ff7c8efeb

Conflicts:
	drivers/video/exynos_fb.c





Conflicts:
	drivers/video/exynos_fb.c







Revert "mtd: cfi_flash: Fix CFI flash driver for 8-bit bus support"
2013-04-12T17:04:54+00:00

Stefan Roese
sr@denx.de

2013-04-12T17:04:54+00:00

e303be2d2819699a443b5eece5a04ecc380a9b61

This reverts commit 239cb9d904cfa8ab50d840a47b3306189d695c75.

Signed-off-by: Stefan Roese <sr@denx.de>





This reverts commit 239cb9d904cfa8ab50d840a47b3306189d695c75.

Signed-off-by: Stefan Roese <sr@denx.de>







Revert "cfi_flash: Use uintptr_t for casts from u32 to void *"
2013-04-12T17:04:37+00:00

Stefan Roese
sr@denx.de

2013-04-12T17:04:37+00:00

b9589ec1a3cd789d09ad0594db82f4140756cf2e

This reverts commit 81a4f7098ba137ea1961cb997ca16d57de2b3483.

Signed-off-by: Stefan Roese <sr@denx.de>





This reverts commit 81a4f7098ba137ea1961cb997ca16d57de2b3483.

Signed-off-by: Stefan Roese <sr@denx.de>







kirkwood_nand: allow usage of NAND_ECC_SOFT_BCH
2013-04-12T16:12:01+00:00

Gerlando Falauto
gerlando.falauto@keymile.com

2013-01-15T22:34:28+00:00

7070b550bee9341bcb53ceda15f9e0a58df88140

If CONFIG_NAND_ECC_BCH is set use 4-bit error correction code instead of
the 1-bit error correction code on the NAND device.

Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
Acked-by: Scott Wood <scottwood@freescale.com>





If CONFIG_NAND_ECC_BCH is set use 4-bit error correction code instead of
the 1-bit error correction code on the NAND device.

Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
Acked-by: Scott Wood <scottwood@freescale.com>







arm: Remove support for unused s3c64xx
2013-04-12T05:55:08+00:00

Benoît Thébaudeau
benoit.thebaudeau@advansee.com

2013-04-11T09:36:00+00:00

e53232250b9dcff4915a6024f9951f52eadb4956

Following the removal of the smdk6400 board, the s3c64xx SoC becomes unused, so
remove associated code. It will still be possible to restore it later from the
Git history if necessary.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>





Following the removal of the smdk6400 board, the s3c64xx SoC becomes unused, so
remove associated code. It will still be possible to restore it later from the
Git history if necessary.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>







nand: mxc: Switch NAND SPL to generic SPL
2013-04-12T05:55:07+00:00

Benoît Thébaudeau
benoit.thebaudeau@advansee.com

2013-04-11T09:35:51+00:00

da962b71758d52b38a4ed89380d296ed25920d18

This also fixes support for mx31pdk and tx25, which had been broken by commit
e05e5de7fae5bec79617e113916dac6631251156.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>





This also fixes support for mx31pdk and tx25, which had been broken by commit
e05e5de7fae5bec79617e113916dac6631251156.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>







nand: mxc: Use appropriate page number in syndrome functions
2013-04-12T05:55:05+00:00

Benoît Thébaudeau
benoit.thebaudeau@advansee.com

2013-04-11T09:35:41+00:00

3ec9d6eb09ca799f2632a58012ef9603982a642d

The syndrome functions should use the page number passed as argument instead of
the page number saved upon NAND_CMD_READ0.

This does not make any difference if the NAND_NO_AUTOINCR option is set, but
otherwise this fixes accesses to the wrong pages.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Acked-by: Scott Wood <scottwood@freescale.com>





The syndrome functions should use the page number passed as argument instead of
the page number saved upon NAND_CMD_READ0.

This does not make any difference if the NAND_NO_AUTOINCR option is set, but
otherwise this fixes accesses to the wrong pages.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Acked-by: Scott Wood <scottwood@freescale.com>







nand: mxc: Fix debug trace in mxc_nand_read_oob_syndrome()
2013-04-12T05:55:04+00:00

Benoît Thébaudeau
benoit.thebaudeau@advansee.com

2013-04-11T09:35:40+00:00

78ee7b1729f69215a07c44b9895f69bd9a4b58a2

The page number indicated in the debug trace of mxc_nand_read_oob_syndrome() did
not match the page being worked on.

By the way, replace the GCC-specific __FUNCTION__ with __func__.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Acked-by: Scott Wood <scottwood@freescale.com>





The page number indicated in the debug trace of mxc_nand_read_oob_syndrome() did
not match the page being worked on.

By the way, replace the GCC-specific __FUNCTION__ with __func__.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Acked-by: Scott Wood <scottwood@freescale.com>







nand: mxc: Add support for i.MX5
2013-04-12T05:55:04+00:00

Benoît Thébaudeau
benoit.thebaudeau@advansee.com

2013-04-11T09:35:37+00:00

35537bc77332feac63f35d538d363e7e5b1a03f3

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>





Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>