X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fubi_uboot.h;h=80acbcb148683d1a6e1ae44b59bd44e66cd93ef6;hb=77511b3b4be449f1547cd97ec6dde780ef589d84;hp=1fd15f43e4ace6318a1c47fc17a7cf66443ade57;hpb=f91df8ca177c446307ac03faa2f00c71dc79a9c2;p=u-boot

diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h
index 1fd15f43e4..80acbcb148 100644
--- a/include/ubi_uboot.h
+++ b/include/ubi_uboot.h
@@ -32,12 +32,9 @@
 #include <onenand_uboot.h>
 #endif
 
-#include <asm/errno.h>
+#include <linux/errno.h>
 
 /* configurable */
-#if !defined(CONFIG_MTD_UBI_WL_THRESHOLD)
-#define CONFIG_MTD_UBI_WL_THRESHOLD	4096
-#endif
 #define CONFIG_MTD_UBI_BEB_RESERVE	1
 
 /* debug options (Linux: drivers/mtd/ubi/Kconfig.debug) */
@@ -51,9 +48,13 @@
 
 #undef CONFIG_MTD_UBI_BLOCK
 
-#if !defined(CONFIG_MTD_UBI_BEB_LIMIT)
-#define CONFIG_MTD_UBI_BEB_LIMIT	20
-#endif
+/* 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
 
 /* build.c */
 #define get_device(...)