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