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 67a3cf1..5783d36 100644
--- a/drivers/mtd/ubi/Kconfig
+++ b/drivers/mtd/ubi/Kconfig
@@ -20,6 +20,18 @@
 
 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