diff options
author | Masahiro Yamada <masahiroy@kernel.org> | 2021-05-30 23:58:42 +0900 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-05-31 10:21:15 +0200 |
commit | 5843c2a40960a3b24c2d6f7568928275f17c2faa (patch) | |
tree | 82831bb50d9fe222e53b7aec182e85f760609739 /scripts/kconfig/streamline_config.pl | |
parent | 663894d99c64fb74b012864366ca6b30088fc1b5 (diff) | |
download | barebox-5843c2a40960a3b24c2d6f7568928275f17c2faa.tar.gz barebox-5843c2a40960a3b24c2d6f7568928275f17c2faa.tar.xz |
kconfig: update to Linux 5.13-rc1
The previous sync was Linux 5.9-rc2.
Resync scripts/kconfig/ with Linux 5.13-rc1.
Highlights:
- make header names in include/config/ and CONFIG symbols match
(scripts/basic/fixdep.c was adjusted)
- remove all 'option' syntax
(common/Kconfig was adjusted)
- introduce KCONFIG_DEFCONFIG_LIST instead of 'option defconfig_list'
- bug fixes and cleanups of nconfig
- drop Qt4 support from xconfig
- bug fixes, improvements, cleanups of xconfig
- print a short log for syncconfig
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Link: https://lore.barebox.org/20210530145842.2610109-2-masahiroy@kernel.org
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'scripts/kconfig/streamline_config.pl')
-rwxr-xr-x | scripts/kconfig/streamline_config.pl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index 19857d18d8..911c72a2db 100755 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -21,7 +21,7 @@ # 1. Boot up the kernel that you want to stream line the config on. # 2. Change directory to the directory holding the source of the # kernel that you just booted. -# 3. Copy the configuraton file to this directory as .config +# 3. Copy the configuration file to this directory as .config # 4. Have all your devices that you need modules for connected and # operational (make sure that their corresponding modules are loaded) # 5. Run this script redirecting the output to some other file @@ -481,7 +481,7 @@ sub parse_config_depends # The idea is we look at all the configs that select it. If one # is already in our list of configs to enable, then there's nothing # else to do. If there isn't, we pick the first config that was -# enabled in the orignal config and use that. +# enabled in the original config and use that. sub parse_config_selects { my ($config, $p) = @_; @@ -593,7 +593,10 @@ while ($repeat) { } my %setconfigs; -my @preserved_kconfigs = split(/:/,$ENV{LMC_KEEP}); +my @preserved_kconfigs; +if (defined($ENV{'LMC_KEEP'})) { + @preserved_kconfigs = split(/:/,$ENV{LMC_KEEP}); +} sub in_preserved_kconfigs { my $kconfig = $config2kfile{$_[0]}; |