diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2008-06-04 09:40:44 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2008-06-06 09:30:39 +0200 |
| commit | 3d45abb7c4be454b6f2a7ede06fe961a04131083 (patch) | |
| tree | f2e4581d485f0a6f285f3c6f62dd973330743e20 /commands | |
| parent | f3351ebd7864b83b1f5f3cdc7c8a9f9110cb562f (diff) | |
| download | barebox-3d45abb7c4be454b6f2a7ede06fe961a04131083.tar.gz barebox-3d45abb7c4be454b6f2a7ede06fe961a04131083.tar.xz | |
[NAND] continue to make it work. Now works partly on at91sam9260
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/Kconfig | 3 | ||||
| -rw-r--r-- | commands/Makefile | 1 | ||||
| -rw-r--r-- | commands/nand.c | 34 |
3 files changed, 23 insertions, 15 deletions
diff --git a/commands/Kconfig b/commands/Kconfig index 08db1dd70a..19b96f206b 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -175,6 +175,9 @@ config CMD_FLASH tristate prompt "protect/erase" +config CMD_NAND + tristate + prompt "nand" endmenu diff --git a/commands/Makefile b/commands/Makefile index 157c8cd8aa..1b3565f915 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -38,3 +38,4 @@ obj-$(CONFIG_CMD_EXPORT) += export.o obj-$(CONFIG_CMD_PRINTENV) += printenv.o obj-$(CONFIG_CMD_SAVEENV) += saveenv.o obj-$(CONFIG_CMD_LOADENV) += loadenv.o +obj-$(CONFIG_CMD_NAND) += nand.o diff --git a/commands/nand.c b/commands/nand.c index 483441a146..4c6b717809 100644 --- a/commands/nand.c +++ b/commands/nand.c @@ -51,14 +51,16 @@ static ssize_t nand_bb_read(struct device_d *dev, void *buf, size_t count, printf("%s %d %d\n", __func__, offset, count); - ret = dev_ioctl(bb->physdev, MEMGETBADBLOCK, (void *)bb->offset); - if (ret < 0) - return ret; - - if (ret) { - printf("block is bad\n"); - bb->offset += bb->info.erasesize; - } + do { + ret = dev_ioctl(bb->physdev, MEMGETBADBLOCK, (void *)bb->offset); + if (ret < 0) + return ret; + + if (ret) { + printf("block is bad\n"); + bb->offset += bb->info.erasesize; + } + } while (ret); ret = dev_read(bb->physdev, buf, count, bb->offset, flags); if (ret > 0) @@ -75,14 +77,16 @@ static ssize_t nand_bb_write(struct device_d *dev, const void *buf, size_t count printf("%s %d %d\n", __func__, offset, count); - ret = dev_ioctl(bb->physdev, MEMGETBADBLOCK, (void *)bb->offset); - if (ret < 0) - return ret; + do { + ret = dev_ioctl(bb->physdev, MEMGETBADBLOCK, (void *)bb->offset); + if (ret < 0) + return ret; - if (ret) { - printf("block is bad\n"); - bb->offset += bb->info.erasesize; - } + if (ret) { + printf("block is bad\n"); + bb->offset += bb->info.erasesize; + } + } while (ret); ret = dev_write(bb->physdev, buf, count, bb->offset, flags); if (ret > 0) |