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 /include | |
parent | c44d3cd1c436af20ffc5f70451151f4de69a2278 (diff) | |
parent | d1cfeee916fe86eddd944f7363f9d2884bdd9814 (diff) | |
download | u-boot-imx-4d70b34d7f721d8b1d4d628e68c3a44ab7a10dff.zip u-boot-imx-4d70b34d7f721d8b1d4d628e68c3a44ab7a10dff.tar.gz u-boot-imx-4d70b34d7f721d8b1d4d628e68c3a44ab7a10dff.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-ubi
Diffstat (limited to 'include')
-rw-r--r-- | include/ubi_uboot.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h index 1fd15f4..324fe72 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 |