* [PATCH] kconfig: use /boot/config-* etc. as DEFCONFIG_LIST only for native build
@ 2021-04-10 14:31 Masahiro Yamada
0 siblings, 0 replies; only message in thread
From: Masahiro Yamada @ 2021-04-10 14:31 UTC (permalink / raw)
To: linux-kbuild; +Cc: Masahiro Yamada, Michal Marek, linux-kernel
When the .config file is missing, 'make config', 'make menuconfig', etc.
uses a file listed in DEFCONFIG_LIST as base configuration.
Ususally, /boot/config-$(uname -r) exists, and is used as default.
However, when you are cross-compiling the kernel, it does not make
sense to use /boot/config-* from the build host. It should default
to arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG).
UML previously did not use DEFCONFIG_LIST at all, but it should be
able to use arch/um/configs/$(KBUILD_DEFCONFIG) as a base config file.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
Makefile | 5 +++++
scripts/kconfig/Makefile | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index f1093b972708..697eaf6c550e 100644
--- a/Makefile
+++ b/Makefile
@@ -393,6 +393,11 @@ ifeq ($(ARCH),sh64)
SRCARCH := sh
endif
+export cross_compiling :=
+ifneq ($(SRCARCH),$(SUBARCH))
+cross_compiling := 1
+endif
+
KCONFIG_CONFIG ?= .config
export KCONFIG_CONFIG
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 46f2465177f0..1d1a7f83ee8d 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -18,14 +18,14 @@ silent := -s
endif
export KCONFIG_DEFCONFIG_LIST :=
-ifneq ($(SRCARCH),um)
+ifndef cross_compiling
kernel-release := $(shell uname -r)
-KCONFIG_DEFCONFIG_LIST := \
+KCONFIG_DEFCONFIG_LIST += \
/lib/modules/$(kernel-release)/.config \
/etc/kernel-config \
- /boot/config-$(kernel-release) \
- arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)
+ /boot/config-$(kernel-release)
endif
+KCONFIG_DEFCONFIG_LIST += arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)
# We need this, in case the user has it in its environment
unexport CONFIG_
--
2.27.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-04-10 14:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-10 14:31 [PATCH] kconfig: use /boot/config-* etc. as DEFCONFIG_LIST only for native build Masahiro Yamada
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.