Merge branch 'master' of git://git.denx.de/u-boot-ubi
This commit is contained in:
commit
4d70b34d7f
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue