Changes in Makefile

1f937a4b - kbuild: suppress stdout from merge_config for silent builds

Tue, 10 Dec 2024 10:24:41 +0000

kbuild: suppress stdout from merge_config for silent buildsmerge_config does not respect the Make's -s (--silent) option.Let's sink the stdout from merge_config for silent builds.This commit does not cater to the direct invocation of merge_config.sh(e.g. arch/mips/Makefile).Reported-by: Leon Romanovsky Closes: https://lore.kernel.org/all/e534ce33b0e1060eb85ece8429810f087b034c88.1733234008.git.leonro@nvidia.com/Signed-off-by: Masahiro Yamada Tested-by: Leon Romanovsky Reviewed-by: Nathan Chancellor List of files: /linux-6.15/scripts/kconfig/Makefile

b1992c37 - kbuild: use $(src) instead of $(srctree)/$(src) for source directory

Sat, 27 Apr 2024 14:55:02 +0000

kbuild: use $(src) instead of $(srctree)/$(src) for source directoryKbuild conventionally uses $(obj)/ for generated files, and $(src)/ forchecked-in source files. It is merely a convention without any functionaldifference. In fact, $(obj) and $(src) are exactly the same, as definedin scripts/Makefile.build: src := $(obj)When the kernel is built in a separate output directory, $(src) doesnot accurately reflect the source directory location. While Kbuildresolves this discrepancy by specifying VPATH=$(srctree) to search forsource files, it does not cover all cases. For example, when adding aheader search path for local headers, -I$(srctree)/$(src) is typicallypassed to the compiler.This introduces inconsistency between upstream and downstream Makefilesbecause $(src) is used instead of $(srctree)/$(src) for the latter.To address this inconsistency, this commit changes the semantics of$(src) so that it always points to the directory in the source tree.Going forward, the variables used in Makefiles will have the followingmeanings: $(obj) - directory in the object tree $(src) - directory in the source tree (changed by this commit) $(objtree) - the top of the kernel object tree $(srctree) - the top of the kernel source treeConsequently, $(srctree)/$(src) in upstream Makefiles need to be replacedwith $(src).Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/kconfig/Makefile

ac14947c - kconfig: Use KCONFIG_CONFIG instead of .config

Tue, 05 Dec 2023 10:45:59 +0000

kconfig: Use KCONFIG_CONFIG instead of .configWhen using a custom location for kernel config files this merge configcommand fails as it doesn't use the configuration set withKCONFIG_CONFIG.Signed-off-by: Markus Schneider-Pargmann Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/kconfig/Makefile

6c07fd84 - kconfig: factor out common code shared by mconf and nconf

Sun, 03 Dec 2023 10:25:23 +0000

kconfig: factor out common code shared by mconf and nconfSeparate out the duplicated code to mnconf-common.c.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/kconfig/Makefile

92ef432f - kbuild: support W=c and W=e shorthands for Kconfig

Thu, 23 Nov 2023 09:05:40 +0000

kbuild: support W=c and W=e shorthands for KconfigKCONFIG_WARN_UNKNOWN_SYMBOLS=1 and KCONFIG_WERROR=1 are descriptiveand suitable in scripting, but typing them from the command line canbe tedious.Associate them with KBUILD_EXTRA_WARN (and the W= shorthand).Support a new letter 'c' to enable extra checks in Kconfig. You canstill manage compiler warnings (W=1) and Kconfig warnings (W=c)independently.Reuse the letter 'e' to turn Kconfig warnings into errors.As usual, you can combine multiple letters in KCONFIG_EXTRA_WARN. $ KCONFIG_WARN_UNKNOWN_SYMBOLS=1 KCONFIG_WERROR=1 make defconfigcan be shortened to: $ KBUILD_EXTRA_WARN=ce make defconfigor, even shorter: $ make W=ce defconfigSigned-off-by: Masahiro Yamada Reviewed-by: Nathan Chancellor List of files: /linux-6.15/scripts/kconfig/Makefile

feec5e1f - kbuild: Show marked Kconfig fragments in "help"

Thu, 31 Aug 2023 19:13:39 +0000

kbuild: Show marked Kconfig fragments in "help"Currently the Kconfig fragments in kernel/configs and arch/*/configsthat aren't used internally aren't discoverable through "make help",which consists of hard-coded lists of config fragments. Instead, listall the fragment targets that have a "# Help: " comment prefix so thetargets can be generated dynamically.Add logic to the Makefile to search for and display the fragment andcomment. Add comments to fragments that are intended to be direct targets.Signed-off-by: Kees Cook Co-developed-by: Masahiro Yamada Acked-by: Michael Ellerman (powerpc)Reviewed-by: Nicolas Schier Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/kconfig/Makefile

aedee9e8 - kconfig: Update all declared targets

Fri, 13 Jan 2023 04:23:59 +0000

kconfig: Update all declared targetsCurrently qconf-cfg.sh is the only script that touches the "-bin"target, even though all of the conf_cfg rules declare that they do.Make the recipe unconditionally touch all declared targets to avoidincompatibilities with upcoming versions of GNU make:https://lists.gnu.org/archive/html/info-gnu/2022-10/msg00008.htmle.g.scripts/kconfig/Makefile:215: warning: pattern recipe did not update peer target 'scripts/kconfig/nconf-bin'.scripts/kconfig/Makefile:215: warning: pattern recipe did not update peer target 'scripts/kconfig/mconf-bin'.scripts/kconfig/Makefile:215: warning: pattern recipe did not update peer target 'scripts/kconfig/gconf-bin'.Signed-off-by: Peter Foley Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/kconfig/Makefile

3122c844 - kconfig: refactor Makefile to reduce process forks

Sun, 11 Dec 2022 02:54:48 +0000

kconfig: refactor Makefile to reduce process forksRefactor Makefile and use read-file macro. For Make >= 4.2, it can readout a file by using the built-in function.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/kconfig/Makefile

c39afe62 - kconfig: Add `make mod2noconfig` to disable module options

Sun, 17 Oct 2021 17:43:13 +0000

kconfig: Add `make mod2noconfig` to disable module optionsWhen converting a modular kernel to a monolithic kernel, once the kernelworks without loading any modules, this helps to quickly disable all themodules before turning off module support entirely.Refactor conf_rewrite_mod_or_yes to a more generalconf_rewrite_tristates that accepts an old and new state.Signed-off-by: Josh Triplett Tested-by: Björn Töpel Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/kconfig/Makefile

a77a05dc - kconfig: split menu.c out of parser.y

Tue, 13 Apr 2021 15:08:17 +0000

kconfig: split menu.c out of parser.yCompile menu.c as an independent compilation unit.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/kconfig/Makefile

f02aa48d - kconfig: use /boot/config-* etc. as DEFCONFIG_LIST only for native build

Sat, 10 Apr 2021 14:31:58 +0000

kconfig: use /boot/config-* etc. as DEFCONFIG_LIST only for native buildWhen the .config file is missing, 'make config', 'make menuconfig', etc.uses a file listed in DEFCONFIG_LIST, if found, 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 makesense to use /boot/config-* on the build host. It should default toarch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG).UML previously did not use DEFCONFIG_LIST at all, but it should beable to use arch/um/configs/$(KBUILD_DEFCONFIG) as a base config file.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/kconfig/Makefile

f8f0d064 - kconfig: do not use allnoconfig_y option

Sat, 13 Mar 2021 19:48:34 +0000

kconfig: do not use allnoconfig_y optionallnoconfig_y is an ugly hack that sets a symbol to 'y' by allnoconfig.allnoconfig does not mean a minimal set of CONFIG options because abunch of prompts are hidden by 'if EMBEDDED' or 'if EXPERT', but I donot like to hack Kconfig this way.Use the pre-existing feature, KCONFIG_ALLCONFIG, to provide a oneliner config fragment. CONFIG_EMBEDDED=y is still forced whenallnoconfig is invoked as a part of tinyconfig.No change in the .config file produced by 'make tinyconfig'.The output of 'make allnoconfig' will be changed; we will getCONFIG_EMBEDDED=n because allnoconfig literally sets all symbols to n.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/kconfig/Makefile

dd465996 - kconfig: move default KBUILD_DEFCONFIG back to scripts/kconfig/Makefile

Sat, 13 Mar 2021 19:48:33 +0000

kconfig: move default KBUILD_DEFCONFIG back to scripts/kconfig/MakefileThis is a partial revert of commit 2a86f6612164 ("kbuild: useKBUILD_DEFCONFIG as the fallback for DEFCONFIG_LIST").Now that the reference to $(DEFCONFIG_LIST) was removed frominit/Kconfig, the default KBUILD_DEFCONFIG can go back home.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/kconfig/Makefile

b75b0a81 - kconfig: change defconfig_list option to environment variable

Sat, 13 Mar 2021 19:48:32 +0000

kconfig: change defconfig_list option to environment variable"defconfig_list" is a weird option that defines a static symbol thatdeclares the list of base config files in case the .config does notexist yet.This is quite different from other normal symbols; we just abused the"string" type and the "default" properties to list out the input files.They must be fixed values since these are searched for and loaded inthe parse stage.It is an ugly hack, and should not exist in the first place. Providingthis feature as an environment variable is a saner approach.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/kconfig/Makefile

f91e46b1 - kconfig: unify rule of config, menuconfig, nconfig, gconfig, xconfig

Sun, 21 Feb 2021 13:03:18 +0000

kconfig: unify rule of config, menuconfig, nconfig, gconfig, xconfigUnify the similar build rules.This supports 'make build_config', which builds scripts/kconfig/confbut does not invoke it.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/kconfig/Makefile

ae8da72b - kconfig: omit --oldaskconfig option for 'make config'

Sun, 21 Feb 2021 13:03:17 +0000

kconfig: omit --oldaskconfig option for 'make config'scripts/kconfig/conf.c line 39 defines the default of input_mode asoldaskconfig. Hence, 'make config' works in the same way even withoutthe --oldaskconfig option given. Note this in the help message.This will be helpful to unify build rules in Makefile in the nextcommit.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/kconfig/Makefile

9bba03d4 - kconfig: remove 'kvmconfig' and 'xenconfig' shorthands

Wed, 23 Dec 2020 06:35:42 +0000

kconfig: remove 'kvmconfig' and 'xenconfig' shorthandsLinux 5.10 is out. Remove the 'kvmconfig' and 'xenconfig' shorthandsas previously announced.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/kconfig/Makefile

23cd88c9 - kbuild: hide commands to run Kconfig, and show short log for syncconfig

Fri, 21 Aug 2020 02:43:58 +0000

kbuild: hide commands to run Kconfig, and show short log for syncconfigSome targets (localyesconfig, localmodconfig, defconfig) hide thecommand running, but the others do not.Users know which Kconfig flavor they are running, so it is OK to hidethe command. Add $(Q) to all commands consistently. If you want to seethe full command running, pass V=1 from the command line.syncconfig is the exceptional case, which occurs without explicitcommand invocation by the user. Display the Kbuild-style log for it.The ugly bare log will go away.[Before]scripts/kconfig/conf --syncconfig Kconfig[After] SYNC include/config/auto.confSigned-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/kconfig/Makefile

0e912c03 - kconfig: qconf: compile moc object separately

Wed, 29 Jul 2020 17:02:38 +0000

kconfig: qconf: compile moc object separatelyCurrently, qconf.moc is included from qconf.cc but they can be compiledindependently.When you modify qconf.cc, qconf.moc does not need recompiling.Rename qconf.moc to qconf-moc.cc, and split it out as an independentcompilation unit.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/kconfig/Makefile

c3cd7cfa - kconfig: qconf: use if_changed for qconf.moc rule

Wed, 29 Jul 2020 17:02:37 +0000

kconfig: qconf: use if_changed for qconf.moc ruleRegenerate qconf.moc when the moc command is changed.This also allows 'make mrproper' to clean it up. Previously, it wasnot cleaned up because 'clean-files += qconf.moc' was missing.Now 'make mrproper' correctly cleans it up because files listed in'targets' are cleaned.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/kconfig/Makefile