@@ -220,6 +220,9 @@
oldconfig: symlinks
$(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
+updconfig updateconfig: symlinks
+ $(CONFIG_SHELL) scripts/Configure -D arch/$(ARCH)/config.in
+
xconfig: symlinks
$(MAKE) -C scripts kconfig.tk
wish -f scripts/kconfig.tk
@@ -115,7 +115,7 @@
# readln prompt default oldval
#
function readln () {
- if [ "$DEFAULT" = "-d" -a -n "$3" ]; then
+ if [ ! -z "$DEFAULT" -a -n "$3" ]; then
echo "$1"
ans=$2
else
@@ -526,8 +526,8 @@
echo "#define AUTOCONF_INCLUDED" >> $CONFIG_H
DEFAULT=""
-if [ "$1" = "-d" ] ; then
- DEFAULT="-d"
+if [ "$1" = "-d" -o "$1" = "-D" ] ; then
+ DEFAULT=$1
shift
fi
@@ -557,10 +557,24 @@
. $CONFIG_IN
+if [ "$DEFAULT" = -D -a -f $DEFAULTS ]; then
+ sed 's/^# CONFIG_/CONFIG_/;p' <.tmpconfig | cat $DEFAULTS - |
+ sed 's/[#=].*//' | sort | uniq -u >.tmpmissing
+ if [ -s .tmpmissing ]; then
+ echo
+ echo "#"
+ echo "# Unused variables (found in $DEFAULTS)"
+ echo "#"
+ cat .tmpmissing
+ fi
+ rm -f .tmpmissing
+fi
+
rm -f .config.old
if [ -f .config ]; then
mv .config .config.old
fi
+
mv .tmpconfig .config
mv .tmpconfig.h include/linux/autoconf.h