qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-ubi

This commit is contained in:
Tom Rini 2014-11-19 23:18:29 -05:00
parent c44d3cd1c4 d1cfeee916
commit 4d70b34d7f
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/mtd/cfi_mtd.c
View File

@ -226,6 +226,7 @@ int cfi_mtd_init(void)
mtd->flags = MTD_CAP_NORFLASH; mtd->flags = MTD_CAP_NORFLASH;
mtd->size = fi->size; mtd->size = fi->size;
mtd->writesize = 1; mtd->writesize = 1;
mtd->writebufsize = mtd->writesize;
mtd->_erase = cfi_mtd_erase; mtd->_erase = cfi_mtd_erase;
mtd->_read = cfi_mtd_read; mtd->_read = cfi_mtd_read;

8
include/ubi_uboot.h
View File

@ -51,6 +51,14 @@
#undef CONFIG_MTD_UBI_BLOCK #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) #if !defined(CONFIG_MTD_UBI_BEB_LIMIT)
#define CONFIG_MTD_UBI_BEB_LIMIT 20 #define CONFIG_MTD_UBI_BEB_LIMIT 20
#endif #endif