merge_config.sh expect prefix from kernel: CONFIG_. There some other projects using kconfig with different prefixes (e.g. buildroot: BR2_ prefix). While there could be some option to specify config prefix [1] [2], IMHO it's better to not specify prefix (expect just any prefix). [1] http://patchwork.ozlabs.org/patch/824051/ [2] https://patchwork.ozlabs.org/patch/988890/ Signed-off-by: Petr Vorel <petr.vorel@xxxxxxxxx> Suggested-by: Marcel Patzlaff <m.patzlaff@xxxxxxx> --- NOTE: I deliberately left prefix CONFIG_ in comment: # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set Kind regards, Petr --- scripts/kconfig/merge_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 67d131447631..538222848bcf 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -99,7 +99,7 @@ if [ ! -r "$INITFILE" ]; then fi MERGE_LIST=$* -SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p" +SED_CONFIG_EXP="s/^\(# \)\{0,1\}\([A-Z0-9_]\+_[a-zA-Z0-9_]*\)[= ].*/\2/p" TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX) echo "Using $INITFILE as base" -- 2.19.1
