From 4a2927f4d5e2e978a0c91e928f0ade8df7565fa6 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Mon, 18 Jan 2010 12:58:31 +0100 Subject: Remove ben nanonote from the linux 2.6.31.bb file. We intend on using linux-hpc branches (and eventually vanilla). Signed-off-by: Kristoffer Ericson --- .../linux/linux-2.6.31/ben-nanonote/050-nand.patch | 68 ---------------------- 1 file changed, 68 deletions(-) delete mode 100644 recipes/linux/linux-2.6.31/ben-nanonote/050-nand.patch (limited to 'recipes/linux/linux-2.6.31/ben-nanonote/050-nand.patch') diff --git a/recipes/linux/linux-2.6.31/ben-nanonote/050-nand.patch b/recipes/linux/linux-2.6.31/ben-nanonote/050-nand.patch deleted file mode 100644 index da0d76caa5..0000000000 --- a/recipes/linux/linux-2.6.31/ben-nanonote/050-nand.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/drivers/mtd/nand/Kconfig -+++ b/drivers/mtd/nand/Kconfig -@@ -452,4 +452,10 @@ config MTD_NAND_SOCRATES - help - Enables support for NAND Flash chips wired onto Socrates board. - -+config MTD_NAND_JZ4740 -+ tristate "Support NAND Flash device on Jz4740 board" -+ depends on SOC_JZ4740 -+ help -+ Support NAND Flash device on Jz4740 board -+ - endif # MTD_NAND ---- a/drivers/mtd/nand/Makefile -+++ b/drivers/mtd/nand/Makefile -@@ -40,5 +40,6 @@ obj-$(CONFIG_MTD_NAND_SH_FLCTL) += sh_f - obj-$(CONFIG_MTD_NAND_MXC) += mxc_nand.o - obj-$(CONFIG_MTD_NAND_SOCRATES) += socrates_nand.o - obj-$(CONFIG_MTD_NAND_TXX9NDFMC) += txx9ndfmc.o -+obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740_nand.o - - nand-objs := nand_base.o nand_bbt.o ---- a/drivers/mtd/nand/nand_base.c -+++ b/drivers/mtd/nand/nand_base.c -@@ -953,29 +953,22 @@ static int nand_read_page_hwecc(struct m - uint8_t *ecc_calc = chip->buffers->ecccalc; - uint8_t *ecc_code = chip->buffers->ecccode; - uint32_t *eccpos = chip->ecc.layout->eccpos; -- -- for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) { -- chip->ecc.hwctl(mtd, NAND_ECC_READ); -- chip->read_buf(mtd, p, eccsize); -- chip->ecc.calculate(mtd, p, &ecc_calc[i]); -- } -- chip->read_buf(mtd, chip->oob_poi, mtd->oobsize); -+ int stat; - - for (i = 0; i < chip->ecc.total; i++) - ecc_code[i] = chip->oob_poi[eccpos[i]]; - -- eccsteps = chip->ecc.steps; -- p = buf; -- -- for (i = 0 ; eccsteps; eccsteps--, i += eccbytes, p += eccsize) { -- int stat; - -+ for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) { -+ chip->ecc.hwctl(mtd, NAND_ECC_READ); -+ chip->read_buf(mtd, p, eccsize); - stat = chip->ecc.correct(mtd, p, &ecc_code[i], &ecc_calc[i]); - if (stat < 0) - mtd->ecc_stats.failed++; - else - mtd->ecc_stats.corrected += stat; - } -+ - return 0; - } - -@@ -1125,6 +1118,8 @@ static int nand_do_read_ops(struct mtd_i - bufpoi = aligned ? buf : chip->buffers->databuf; - - if (likely(sndcmd)) { -+ chip->cmdfunc(mtd, NAND_CMD_READOOB, 0x00, page); -+ chip->read_buf(mtd, chip->oob_poi, mtd->oobsize); - chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page); - sndcmd = 0; - } -- cgit v1.2.3