bootconfig: Remove unneeded CONFIG_LIBXBC

Since there is no user except CONFIG_BOOT_CONFIG and no plan
to use it from other functions, CONFIG_LIBXBC can be removed
and we can use CONFIG_BOOT_CONFIG directly.

Link: http://lkml.kernel.org/r/158098769281.939.16293492056419481105.stgit@devnote2
Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/init/Kconfig b/init/Kconfig
index 9506299a53e340d4255a32cba1c2e07a474bd8de..4a672c6629d04068fd7f3981e07cc97d78759944 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1218,7 +1218,6 @@ endif
 config BOOT_CONFIG
        bool "Boot config support"
        depends on BLK_DEV_INITRD
-       select LIBXBC
        default y
        help
          Extra boot config allows system admin to pass a config file as

diff --git a/lib/Kconfig b/lib/Kconfig
index 10012b64600966f3bfeb07c526ed5d37862a88bb..6e790dc55c5b0cc88001978d96a2ad982989b8da 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -566,9 +566,6 @@ config DIMLIB
 config LIBFDT
        bool
 
-config LIBXBC
-       bool
-
 config OID_REGISTRY
        tristate
        help

diff --git a/lib/Makefile b/lib/Makefile
index 75a64d2552a259a7332d61ee76089d0501b38cce..74c1223828c1d50d85adf89bca454a03b720498d 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -228,7 +228,7 @@ $(foreach file, $(libfdt_files), \
        $(eval CFLAGS_$(file) = -I $(srctree)/scripts/dtc/libfdt))
 lib-$(CONFIG_LIBFDT) += $(libfdt_files)
 
-lib-$(CONFIG_LIBXBC) += bootconfig.o
+lib-$(CONFIG_BOOT_CONFIG) += bootconfig.o
 
 obj-$(CONFIG_RBTREE_TEST) += rbtree_test.o
 obj-$(CONFIG_INTERVAL_TREE_TEST) += interval_tree_test.o