diff options
| author | Tom Rini <trini@ti.com> | 2014-11-19 23:18:29 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-19 23:18:29 -0500 |
| commit | 4d70b34d7f721d8b1d4d628e68c3a44ab7a10dff (patch) | |
| tree | dc11891c269c601a8c0a610bb0019b3aee3738c1 | |
| parent | c44d3cd1c436af20ffc5f70451151f4de69a2278 (diff) | |
| parent | d1cfeee916fe86eddd944f7363f9d2884bdd9814 (diff) | |
| download | u-boot-4d70b34d7f721d8b1d4d628e68c3a44ab7a10dff.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-ubi
| -rw-r--r-- | drivers/mtd/cfi_mtd.c | 1 | ||||
| -rw-r--r-- | include/ubi_uboot.h | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/mtd/cfi_mtd.c b/drivers/mtd/cfi_mtd.c index ac805ff1e9..709a48642d 100644 --- a/drivers/mtd/cfi_mtd.c +++ b/drivers/mtd/cfi_mtd.c @@ -226,6 +226,7 @@ int cfi_mtd_init(void) mtd->flags = MTD_CAP_NORFLASH; mtd->size = fi->size; mtd->writesize = 1; + mtd->writebufsize = mtd->writesize; mtd->_erase = cfi_mtd_erase; mtd->_read = cfi_mtd_read; diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h index 1fd15f43e4..324fe72016 100644 --- a/include/ubi_uboot.h +++ b/include/ubi_uboot.h @@ -51,6 +51,14 @@ #undef CONFIG_MTD_UBI_BLOCK +/* ubi_init() disables returning error codes when built into the Linux + * kernel so that it doesn't hang the Linux kernel boot process. Since + * the U-Boot driver code depends on getting valid error codes from this + * function we just tell the UBI layer that we are building as a module + * (which only enables the additional error reporting). + */ +#define CONFIG_MTD_UBI_MODULE + #if !defined(CONFIG_MTD_UBI_BEB_LIMIT) #define CONFIG_MTD_UBI_BEB_LIMIT 20 #endif |