kconfig: Sync with upstream v4.20

6bbe4385d035 kconfig: merge_config: avoid false positive matches from comment lines
2cd3faf87d2d merge_config.sh: Allow to define config prefix
0085b4191f3e kconfig: remove silentoldconfig target
04c459d20448 kconfig: remove oldnoconfig target

Signed-off-by: Chris Packham <judge.packham@gmail.com>
This commit is contained in:
Chris Packham 2020-12-09 21:55:38 +13:00
parent df94f6803f
commit b16baed494

View File

@ -460,12 +460,6 @@ static struct option long_opts[] = {
{"randconfig", no_argument, NULL, randconfig},
{"listnewconfig", no_argument, NULL, listnewconfig},
{"olddefconfig", no_argument, NULL, olddefconfig},
/*
* oldnoconfig is an alias of olddefconfig, because people already
* are dependent on its behavior(sets new symbols to their default
* value but not 'n') with the counter-intuitive name.
*/
{"oldnoconfig", no_argument, NULL, olddefconfig},
{NULL, 0, NULL, 0}
};