diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 09:21:49 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 09:21:49 +0100 |
| commit | 62ee96bd3b5e02173c0d9956c4f1e1a4de8f940d (patch) | |
| tree | 1c9d519fb35c8c599bb31c4ee836f3ac135d933d /commands/ubiformat.c | |
| parent | 13408877f4c0d4b2784d3388dd4481369205e46a (diff) | |
| parent | ef06284cd947c4e90a54a62d2c106789c6eaebe8 (diff) | |
| download | barebox-62ee96bd3b5e02173c0d9956c4f1e1a4de8f940d.tar.gz barebox-62ee96bd3b5e02173c0d9956c4f1e1a4de8f940d.tar.xz | |
Merge branch 'for-next/mtd'
Conflicts:
arch/arm/configs/eukrea_cpuimx27_defconfig
drivers/mtd/core.c
Diffstat (limited to 'commands/ubiformat.c')
| -rw-r--r-- | commands/ubiformat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/commands/ubiformat.c b/commands/ubiformat.c index efe1fde9fa..47941bedba 100644 --- a/commands/ubiformat.c +++ b/commands/ubiformat.c @@ -338,7 +338,7 @@ static int flash_image(const struct mtd_dev_info *mtd, normsg_cont("eraseblock %d: erase", eb); } - err = mtd_erase(mtd, args.node_fd, eb); + err = libmtd_erase(mtd, args.node_fd, eb); if (err) { if (!args.quiet) printf("\n"); @@ -384,7 +384,7 @@ static int flash_image(const struct mtd_dev_info *mtd, new_len = drop_ffs(mtd, buf, mtd->eb_size); - err = mtd_write(mtd, args.node_fd, eb, 0, buf, new_len); + err = libmtd_write(mtd, args.node_fd, eb, 0, buf, new_len); if (err) { sys_errmsg("cannot write eraseblock %d", eb); @@ -453,7 +453,7 @@ static int format(const struct mtd_dev_info *mtd, normsg_cont("eraseblock %d: erase", eb); } - err = mtd_erase(mtd, args.node_fd, eb); + err = libmtd_erase(mtd, args.node_fd, eb); if (err) { if (!args.quiet) printf("\n"); @@ -484,7 +484,7 @@ static int format(const struct mtd_dev_info *mtd, printf(", write EC %lld\n", ec); } - err = mtd_write(mtd, args.node_fd, eb, 0, hdr, write_size); + err = libmtd_write(mtd, args.node_fd, eb, 0, hdr, write_size); if (err) { if (!args.quiet && !args.verbose) printf("\n"); |