[for-linus][PATCH 2/4] bootconfig: Remove unneeded CONFIG_LIBXBC

Steven Rostedt
2020-02-10T14:45:43Z

From: Masami Hiramatsu <mhiramat@kernel.org>

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>
---
init/Kconfig | 1 -
lib/Kconfig | 3 ---
lib/Makefile | 2 +-
3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/init/Kconfig b/init/Kconfig
index 9506299a53e3..4a672c6629d0 100644
--- 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 10012b646009..6e790dc55c5b 100644
--- 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 75a64d2552a2..74c1223828c1 100644
--- 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
--
2.24.1