1Index: kconfig/merge_config.sh
2===================================================================
3--- kconfig.orig/merge_config.sh
4+++ kconfig/merge_config.sh
5@@ -34,12 +34,16 @@ usage() {
6 	echo "  -r    list redundant entries when merging fragments"
7 	echo "  -O    dir to put generated output files.  Consider setting \$KCONFIG_CONFIG instead."
8 	echo "  -e    colon-separated list of br2-external trees to use (optional)"
9+	echo
10+	echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_
11+	environment variable."
12 }
13
14 RUNMAKE=true
15 ALLTARGET=alldefconfig
16 WARNREDUN=false
17 OUTPUT=.
18+CONFIG_PREFIX=${CONFIG_-CONFIG_}
19
20 while true; do
21 	case $1 in
22@@ -105,7 +109,8 @@ if [ ! -r "$INITFILE" ]; then
23 fi
24
25 MERGE_LIST=$*
26-SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
27+SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)[= ].*/\2/p"
28+
29 TMP_FILE=$(mktemp -t .tmp.config.XXXXXXXXXX)
30
31 echo "Using $INITFILE as base"
32