diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-08 19:02:06 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-25 10:24:16 +0200 |
| commit | 50f75a1a0e3c51fca1576bd41588d6e71caff02e (patch) | |
| tree | 962ab1e2d69db1dc451a19e7185fdeda9c2ed924 /commands | |
| parent | 10f7528afbc9dfa232c02f8a2b45857858fc64b4 (diff) | |
| download | barebox-50f75a1a0e3c51fca1576bd41588d6e71caff02e.tar.gz barebox-50f75a1a0e3c51fca1576bd41588d6e71caff02e.tar.xz | |
UBI: reimport UBI from Linux v3.10
This is a fresh UBI import from Linux v3.10
This is done mainly to get fastmap support.
This was tested with the i.MX nand driver, the MXS nand driver and
on CFI NOR flash.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/Kconfig | 6 | ||||
| -rw-r--r-- | commands/ubi.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/commands/Kconfig b/commands/Kconfig index 7cc71298b7..ede1b3aa7e 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -401,13 +401,13 @@ config CMD_FLASH config CMD_UBI tristate - default y if UBI - depends on UBI + default y if MTD_UBI + depends on MTD_UBI prompt "ubimkvol, ubirmvol, ubiattach" config CMD_UBIFORMAT tristate - depends on UBI + depends on MTD_UBI select LIBMTD select LIBSCAN select LIBUBIGEN diff --git a/commands/ubi.c b/commands/ubi.c index 5b57d0bd6c..2041df3fd5 100644 --- a/commands/ubi.c +++ b/commands/ubi.c @@ -76,7 +76,7 @@ static int do_ubiattach(int argc, char *argv[]) goto err; } - ret = ubi_attach_mtd_dev(user.mtd, UBI_DEV_NUM_AUTO, 0); + ret = ubi_attach_mtd_dev(user.mtd, UBI_DEV_NUM_AUTO, 0, 20); if (ret < 0) printf("failed to attach: %s\n", strerror(-ret)); else |