mtd: ubi: Finish moving configuration to Kconfig

We have some unused and undefined symbols to remove references to, so do
that. Move the final things that we do set (or need to keep unset) to
Kconfig instead.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig
index 67a3cf1d7a50ca003d109e4a9309b7e304c994a3..5783d36c048fbd9bdc4c1d3110987337bd7feeea 100644 (file)
--- a/drivers/mtd/ubi/Kconfig
+++ b/drivers/mtd/ubi/Kconfig
@@ -20,6 +20,18 @@ config MTD_UBI
 
 if MTD_UBI
 
+config MTD_UBI_BLOCK
+       def_bool n
+
+config MTD_UBI_MODULE
+       def_bool y
+       help
+         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).
+
 config MTD_UBI_WL_THRESHOLD
        int "UBI wear-leveling threshold"
        default 4096

diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h
index 0770228cd895c6494e6a95b7810b9b8f39008037..6da348eb6285f36b63b3391b6b62fa683a582e43 100644 (file)
--- a/include/ubi_uboot.h
+++ b/include/ubi_uboot.h
@@ -34,28 +34,6 @@
 
 #include <linux/errno.h>
 
-/* configurable */
-#define CONFIG_MTD_UBI_BEB_RESERVE     1
-
-/* debug options (Linux: drivers/mtd/ubi/Kconfig.debug) */
-#undef CONFIG_MTD_UBI_DEBUG
-#undef CONFIG_MTD_UBI_DEBUG_PARANOID
-#undef CONFIG_MTD_UBI_DEBUG_MSG
-#undef CONFIG_MTD_UBI_DEBUG_MSG_EBA
-#undef CONFIG_MTD_UBI_DEBUG_MSG_WL
-#undef CONFIG_MTD_UBI_DEBUG_MSG_IO
-#undef CONFIG_MTD_UBI_DEBUG_MSG_BLD
-
-#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
-
 /* build.c */
 #define get_device(...)
 #define put_device(...)