Commit 79b05c1f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Masahiro Yamada

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: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 9d3cce1e
# SPDX-License-Identifier: GPL-2.0
source "arch/$(HEADER_ARCH)/um/Kconfig"
...@@ -113,8 +113,6 @@ define archhelp ...@@ -113,8 +113,6 @@ define archhelp
echo ' find in the kernel root.' echo ' find in the kernel root.'
endef endef
KBUILD_KCONFIG := $(HOST_DIR)/um/Kconfig
archheaders: archheaders:
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \ $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
kbuild-file=$(HOST_DIR)/include/asm/Kbuild \ kbuild-file=$(HOST_DIR)/include/asm/Kbuild \
...@@ -176,4 +174,4 @@ endef ...@@ -176,4 +174,4 @@ endef
include/generated/user_constants.h: $(HOST_DIR)/um/user-offsets.s include/generated/user_constants.h: $(HOST_DIR)/um/user-offsets.s
$(call filechk,gen-asm-offsets) $(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
# SPDX-License-Identifier: GPL-2.0 # 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" source "arch/um/Kconfig.common"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment