diff options
| author | Chris Packham <judge.packham@gmail.com> | 2020-12-10 19:51:50 +1300 |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2021-02-02 20:06:32 +1300 |
| commit | acce58834d83602b5c97cb01f04c9f540e40792b (patch) | |
| tree | d672f90c8bd4276c41369265a54cbb60d0d5a521 /kconfig/conf.c | |
| parent | 31695dd2b00fc3daac109324992901fdcd6068e5 (diff) | |
| download | crosstool-ng-acce58834d83602b5c97cb01f04c9f540e40792b.tar.gz crosstool-ng-acce58834d83602b5c97cb01f04c9f540e40792b.tar.bz2 crosstool-ng-acce58834d83602b5c97cb01f04c9f540e40792b.zip | |
kconfig: Sync with upstream v5.5
This commit introduces the following upstream changes:
272a72103012 kconfig: don't crash on NULL expressions in expr_eq()
46b2afa6890d kconfig: be more helpful if pkg-config is missing
5d8b42aa7ccb kconfig: Add option to get the full help text with listnewconfig
a64c0440dda1 kbuild: Wrap long "make help" text lines
521b29b6ff53 kconfig: split util.c out of parser.y
60bef52c7a68 merge_config.sh: ignore unwanted grep errors
54b8ae66ae1a kbuild: change *FLAGS_<basetarget>.o to take the path relative to $(obj)
1634f2bfdb84 kbuild: remove clean-dirs syntax
cdfca821571d merge_config.sh: Check error codes from make
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Diffstat (limited to 'kconfig/conf.c')
| -rw-r--r-- | kconfig/conf.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/kconfig/conf.c b/kconfig/conf.c index dd714b48..393e96e4 100644 --- a/kconfig/conf.c +++ b/kconfig/conf.c @@ -32,6 +32,7 @@ enum input_mode { defconfig, savedefconfig, listnewconfig, + helpnewconfig, olddefconfig, }; static enum input_mode input_mode = oldaskconfig; @@ -434,6 +435,11 @@ static void check_conf(struct menu *menu) printf("%s%s=%s\n", CONFIG_, sym->name, str); } } + } else if (input_mode == helpnewconfig) { + printf("-----\n"); + print_help(menu); + printf("-----\n"); + } else { if (!conf_cnt++) printf("*\n* Restart config...\n*\n"); @@ -459,6 +465,7 @@ static struct option long_opts[] = { {"alldefconfig", no_argument, NULL, alldefconfig}, {"randconfig", no_argument, NULL, randconfig}, {"listnewconfig", no_argument, NULL, listnewconfig}, + {"helpnewconfig", no_argument, NULL, helpnewconfig}, {"olddefconfig", no_argument, NULL, olddefconfig}, {NULL, 0, NULL, 0} }; @@ -523,6 +530,7 @@ int main(int ac, char **av) case allmodconfig: case alldefconfig: case listnewconfig: + case helpnewconfig: case olddefconfig: break; case '?': @@ -556,6 +564,7 @@ int main(int ac, char **av) case oldaskconfig: case oldconfig: case listnewconfig: + case helpnewconfig: case olddefconfig: conf_read(NULL); break; @@ -637,6 +646,7 @@ int main(int ac, char **av) /* fall through */ case oldconfig: case listnewconfig: + case helpnewconfig: case syncconfig: /* Update until a loop caused no more changes */ do { @@ -655,7 +665,7 @@ int main(int ac, char **av) defconfig_file); return 1; } - } else if (input_mode != listnewconfig) { + } else if (input_mode != listnewconfig && input_mode != helpnewconfig) { if (!no_conf_write && conf_write(NULL)) { fprintf(stderr, "\n*** Error during writing of the configuration.\n\n"); exit(1); |