Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79b05c1f authored Jul 31, 2018 by Christoph Hellwig Committed by Masahiro Yamada Aug 02, 2018

um: stop abusing KBUILD_KCONFIG



Instead create a arch/um/Kconfig file that just includes the actual
per-arch Kconfig file.  Note that we use HEADER_ARCH to find the
per-arch Kconfig file as that variable already includes the
normalization from i386 or x86_64 to x86.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

parent 9d3cce1e

arch/um/Kconfig

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0

		source "arch/$(HEADER_ARCH)/um/Kconfig"

arch/um/Makefile

+1 −3

Original line number	Diff line number	Diff line
		@@ -113,8 +113,6 @@ define archhelp
		echo ' find in the kernel root.'
		endef

		KBUILD_KCONFIG := $(HOST_DIR)/um/Kconfig

		archheaders:
		$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
		kbuild-file=$(HOST_DIR)/include/asm/Kbuild \
		@@ -176,4 +174,4 @@ endef
		include/generated/user_constants.h: $(HOST_DIR)/um/user-offsets.s
		$(call filechk,gen-asm-offsets)

		export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS DEV_NULL_PATH
		export HEADER_ARCH SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS DEV_NULL_PATH

arch/x86/um/Kconfig

+0 −5

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		mainmenu "User Mode Linux/$(SUBARCH) $(KERNELVERSION) Kernel Configuration"

		comment "Compiler: $(CC_VERSION_TEXT)"

		source "scripts/Kconfig.include"

		source "arch/um/Kconfig.common"