diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-04-08 13:37:28 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-04-08 13:37:28 +0200 |
| commit | 45ad47a30190fdeb6602835f71dd5bb076695315 (patch) | |
| tree | 18211981b096820ed4a494fa8292546b7164ffc0 /drivers | |
| parent | 5a4379527259d426c2ac8f5f06c358c175a33237 (diff) | |
| parent | a63059d753680ce249942e2e6c4eba56c4840542 (diff) | |
| download | barebox-45ad47a30190fdeb6602835f71dd5bb076695315.tar.gz barebox-45ad47a30190fdeb6602835f71dd5bb076695315.tar.xz | |
Merge branch 'for-next/ubifs'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nor/cfi_flash.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/ubi/build.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/ubi/ubi-barebox.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mtd/nor/cfi_flash.c b/drivers/mtd/nor/cfi_flash.c index e50f0e667f..5bdcccae18 100644 --- a/drivers/mtd/nor/cfi_flash.c +++ b/drivers/mtd/nor/cfi_flash.c @@ -956,6 +956,7 @@ static void cfi_init_mtd(struct flash_info *info) mtd->erasesize = erasesize; mtd->writesize = 1; + mtd->writebufsize = info->buffer_size; mtd->subpage_sft = 0; mtd->eraseregions = info->eraseregions; mtd->numeraseregions = info->numeraseregions; diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index 797022636d..268cc6fc1a 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -327,7 +327,7 @@ static int io_init(struct ubi_device *ubi, int max_beb_per1024) ubi_assert(ubi->hdrs_min_io_size <= ubi->min_io_size); ubi_assert(ubi->min_io_size % ubi->hdrs_min_io_size == 0); - ubi->max_write_size = ubi->mtd->writesize; /* FIXME: writebufsize */ + ubi->max_write_size = ubi->mtd->writebufsize; /* * Maximum write size has to be greater or equivalent to min. I/O * size, and be multiple of min. I/O size. diff --git a/drivers/mtd/ubi/ubi-barebox.h b/drivers/mtd/ubi/ubi-barebox.h index 03069d0947..ab970aa19d 100644 --- a/drivers/mtd/ubi/ubi-barebox.h +++ b/drivers/mtd/ubi/ubi-barebox.h @@ -42,8 +42,6 @@ static inline unsigned long copy_from_user(void *dest, const void *src, /* common */ -#define GFP_NOFS 1 - #define wake_up_process(...) do { } while (0) #define BUS_ID_SIZE 20 |