15 files changed, 174 insertions, 198 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 9645c0739386..d9b1fef0c67e 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -2,7 +2,7 @@
 # Kernel configuration targets
 # These targets are used from top-level makefile
 
-PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \
+PHONY += xconfig gconfig menuconfig config silentoldconfig update-po-config \
         localmodconfig localyesconfig
 
 ifdef KBUILD_KCONFIG
@@ -11,30 +11,31 @@ else
 Kconfig := Kconfig
 endif
 
+ifeq ($(quiet),silent_)
+silent := -s
+endif
+
 # We need this, in case the user has it in its environment
 unexport CONFIG_
 
 xconfig: $(obj)/qconf
-        $< $(Kconfig)
+        $< $(silent) $(Kconfig)
 
 gconfig: $(obj)/gconf
-        $< $(Kconfig)
+        $< $(silent) $(Kconfig)
 
 menuconfig: $(obj)/mconf
-        $< $(Kconfig)
+        $< $(silent) $(Kconfig)
 
 config: $(obj)/conf
-        $< --oldaskconfig $(Kconfig)
+        $< $(silent) --oldaskconfig $(Kconfig)
 
 nconfig: $(obj)/nconf
-        $< $(Kconfig)
-
-oldconfig: $(obj)/conf
-        $< --$@ $(Kconfig)
+        $< $(silent) $(Kconfig)
 
 silentoldconfig: $(obj)/conf
         $(Q)mkdir -p include/config include/generated
-        $< --$@ $(Kconfig)
+        $< $(silent) --$@ $(Kconfig)
 
 localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
         $(Q)mkdir -p include/config include/generated
@@ -43,18 +44,18 @@ localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
                         cmp -s .tmp.config .config ||                   \
                         (mv -f .config .config.old.1;                   \
                          mv -f .tmp.config .config;                     \
-                         $(obj)/conf --silentoldconfig $(Kconfig);      \
+                         $(obj)/conf $(silent) --silentoldconfig $(Kconfig); \
                          mv -f .config.old.1 .config.old)               \
         else                                                            \
                         mv -f .tmp.config .config;                      \
-                        $(obj)/conf --silentoldconfig $(Kconfig);       \
+                        $(obj)/conf $(silent) --silentoldconfig $(Kconfig); \
         fi
         $(Q)rm -f .tmp.config
 
 # Create new linux.pot file
 # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
 update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
-        $(Q)echo "  GEN     config.pot"
+        $(Q)$(kecho) "  GEN     config.pot"
         $(Q)xgettext --default-domain=linux                         \
             --add-comments --keyword=_ --keyword=N_                 \
             --from-code=UTF-8                                       \
@@ -65,61 +66,58 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
         $(Q)(for i in `ls $(srctree)/arch/*/Kconfig      \
             $(srctree)/arch/*/um/Kconfig`;               \
             do                                           \
-                echo "  GEN     $$i";                    \
+                $(kecho) "  GEN     $$i";                    \
                 $(obj)/kxgettext $$i                     \
                      >> $(obj)/config.pot;               \
             done )
-        $(Q)echo "  GEN     linux.pot"
+        $(Q)$(kecho) "  GEN     linux.pot"
         $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
             --output $(obj)/linux.pot
         $(Q)rm -f $(obj)/config.pot
 
-PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
-
-allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf
-        $< --$@ $(Kconfig)
+# These targets map 1:1 to the commandline options of 'conf'
+simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
+        alldefconfig randconfig listnewconfig olddefconfig
+PHONY += $(simple-targets)
 
-PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig
+$(simple-targets): $(obj)/conf
+        $< $(silent) --$@ $(Kconfig)
 
-listnewconfig olddefconfig: $(obj)/conf
-        $< --$@ $(Kconfig)
+PHONY += oldnoconfig savedefconfig defconfig
 
 # 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: $(obj)/conf
-        $< --olddefconfig $(Kconfig)
+oldnoconfig: olddefconfig
 
 savedefconfig: $(obj)/conf
-        $< --$@=defconfig $(Kconfig)
+        $< $(silent) --$@=defconfig $(Kconfig)
 
 defconfig: $(obj)/conf
 ifeq ($(KBUILD_DEFCONFIG),)
-        $< --defconfig $(Kconfig)
+        $< $(silent) --defconfig $(Kconfig)
 else
-        @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
-        $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
+        @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
+        $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
 endif
 
 %_defconfig: $(obj)/conf
-        $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
+        $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
 
-configfiles=$(wildcard $(srctree)/kernel/configs/$(1).config $(srctree)/arch/$(SRCARCH)/configs/$(1).config)
+configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)
 
-define mergeconfig
-$(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target))
-$(if $(call configfiles,$(1)),, $(error No configuration exists for this target on this architecture))
-$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(call configfiles,$(1))
-$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
-endef
+%.config: $(obj)/conf
+        $(if $(call configfiles),, $(error No configuration exists for this target on this architecture))
+        $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles)
+        +$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
 
 PHONY += kvmconfig
-kvmconfig:
-        $(call mergeconfig,kvm_guest)
+kvmconfig: kvm_guest.config
+        @:
 
 PHONY += tinyconfig
-tinyconfig: allnoconfig
-        $(call mergeconfig,tiny)
+tinyconfig:
+        $(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config
 
 # Help text used by make help
 help:
@@ -221,7 +219,7 @@ $(obj)/.tmp_qtcheck: $(src)/Makefile
 
 # QT needs some extra effort...
 $(obj)/.tmp_qtcheck:
-        @set -e; echo "  CHECK   qt"; dir=""; pkg=""; \
+        @set -e; $(kecho) "  CHECK   qt"; dir=""; pkg=""; \
         if ! pkg-config --exists QtCore 2> /dev/null; then \
             echo "* Unable to find the QT4 tool qmake. Trying to use QT3"; \
             pkg-config --exists qt 2> /dev/null && pkg=qt; \
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index fef75fc756f4..6c204318bc94 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -471,7 +471,7 @@ static struct option long_opts[] = {
 static void conf_usage(const char *progname)
 {
 
-        printf("Usage: %s [option] <kconfig-file>\n", progname);
+        printf("Usage: %s [-s] [option] <kconfig-file>\n", progname);
         printf("[option] is _one_ of the following:\n");
         printf("  --listnewconfig         List new options\n");
         printf("  --oldaskconfig          Start a new configuration using a line-oriented program\n");
@@ -501,7 +501,11 @@ int main(int ac, char **av)
 
         tty_stdio = isatty(0) && isatty(1) && isatty(2);
 
-        while ((opt = getopt_long(ac, av, "", long_opts, NULL)) != -1) {
+        while ((opt = getopt_long(ac, av, "s", long_opts, NULL)) != -1) {
+                if (opt == 's') {
+                        conf_set_message_callback(NULL);
+                        continue;
+                }
                 input_mode = (enum input_mode)opt;
                 switch (opt) {
                 case silentoldconfig:
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 28df18dd1147..c814f57672fc 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -16,6 +16,11 @@
 
 #include "lkc.h"
 
+struct conf_printer {
+        void (*print_symbol)(FILE *, struct symbol *, const char *, void *);
+        void (*print_comment)(FILE *, const char *, void *);
+};
+
 static void conf_warning(const char *fmt, ...)
         __attribute__ ((format (printf, 1, 2)));
 
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index d6626521f9b9..fb0a2a286dca 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -11,6 +11,12 @@
 
 #define DEBUG_EXPR      0
 
+static int expr_eq(struct expr *e1, struct expr *e2);
+static struct expr *expr_eliminate_yn(struct expr *e);
+static struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2);
+static struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2);
+static void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2);
+
 struct expr *expr_alloc_symbol(struct symbol *sym)
 {
         struct expr *e = xcalloc(1, sizeof(*e));
@@ -186,7 +192,7 @@ void expr_eliminate_eq(struct expr **ep1, struct expr **ep2)
 #undef e1
 #undef e2
 
-int expr_eq(struct expr *e1, struct expr *e2)
+static int expr_eq(struct expr *e1, struct expr *e2)
 {
         int res, old_count;
 
@@ -228,7 +234,7 @@ int expr_eq(struct expr *e1, struct expr *e2)
         return 0;
 }
 
-struct expr *expr_eliminate_yn(struct expr *e)
+static struct expr *expr_eliminate_yn(struct expr *e)
 {
         struct expr *tmp;
 
@@ -823,7 +829,7 @@ bool expr_depends_symbol(struct expr *dep, struct symbol *sym)
         return false;
 }
 
-struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2)
+static struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2)
 {
         struct expr *tmp = NULL;
         expr_extract_eq(E_AND, &tmp, ep1, ep2);
@@ -834,7 +840,7 @@ struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2)
         return tmp;
 }
 
-struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2)
+static struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2)
 {
         struct expr *tmp = NULL;
         expr_extract_eq(E_OR, &tmp, ep1, ep2);
@@ -845,7 +851,7 @@ struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2)
         return tmp;
 }
 
-void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2)
+static void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2)
 {
 #define e1 (*ep1)
 #define e2 (*ep2)
@@ -976,11 +982,8 @@ tristate expr_calc_value(struct expr *e)
         }
 }
 
-int expr_compare_type(enum expr_type t1, enum expr_type t2)
+static int expr_compare_type(enum expr_type t1, enum expr_type t2)
 {
-#if 0
-        return 1;
-#else
         if (t1 == t2)
                 return 0;
         switch (t1) {
@@ -1005,7 +1008,6 @@ int expr_compare_type(enum expr_type t1, enum expr_type t2)
         }
         printf("[%dgt%d?]", t1, t2);
         return 0;
-#endif
 }
 
 static inline struct expr *
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 412ea8a2abb8..a2fc96a2bd2c 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -205,18 +205,13 @@ struct expr *expr_alloc_and(struct expr *e1, struct expr *e2);
 struct expr *expr_alloc_or(struct expr *e1, struct expr *e2);
 struct expr *expr_copy(const struct expr *org);
 void expr_free(struct expr *e);
-int expr_eq(struct expr *e1, struct expr *e2);
 void expr_eliminate_eq(struct expr **ep1, struct expr **ep2);
 tristate expr_calc_value(struct expr *e);
-struct expr *expr_eliminate_yn(struct expr *e);
 struct expr *expr_trans_bool(struct expr *e);
 struct expr *expr_eliminate_dups(struct expr *e);
 struct expr *expr_transform(struct expr *e);
 int expr_contains_symbol(struct expr *dep, struct symbol *sym);
 bool expr_depends_symbol(struct expr *dep, struct symbol *sym);
-struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2);
-struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2);
-void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2);
 struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym);
 struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2);
 
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index d0a35b21f308..26d208b435a0 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -169,14 +169,6 @@ void init_main_window(const gchar * glade_file)
         style = gtk_widget_get_style(main_wnd);
         widget = glade_xml_get_widget(xml, "toolbar1");
 
-#if 0   /* Use stock Gtk icons instead */
-        replace_button_icon(xml, main_wnd->window, style,
-                            "button1", (gchar **) xpm_back);
-        replace_button_icon(xml, main_wnd->window, style,
-                            "button2", (gchar **) xpm_load);
-        replace_button_icon(xml, main_wnd->window, style,
-                            "button3", (gchar **) xpm_save);
-#endif
         replace_button_icon(xml, main_wnd->window, style,
                             "button4", (gchar **) xpm_single_view);
         replace_button_icon(xml, main_wnd->window, style,
@@ -184,22 +176,6 @@ void init_main_window(const gchar * glade_file)
         replace_button_icon(xml, main_wnd->window, style,
                             "button6", (gchar **) xpm_tree_view);
 
-#if 0
-        switch (view_mode) {
-        case SINGLE_VIEW:
-                widget = glade_xml_get_widget(xml, "button4");
-                g_signal_emit_by_name(widget, "clicked");
-                break;
-        case SPLIT_VIEW:
-                widget = glade_xml_get_widget(xml, "button5");
-                g_signal_emit_by_name(widget, "clicked");
-                break;
-        case FULL_VIEW:
-                widget = glade_xml_get_widget(xml, "button6");
-                g_signal_emit_by_name(widget, "clicked");
-                break;
-        }
-#endif
         txtbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w));
         tag1 = gtk_text_buffer_create_tag(txtbuf, "mytag1",
                                           "foreground", "red",
@@ -1498,9 +1474,12 @@ int main(int ac, char *av[])
                 case 'a':
                         //showAll = 1;
                         break;
+                case 's':
+                        conf_set_message_callback(NULL);
+                        break;
                 case 'h':
                 case '?':
-                        printf("%s <config>\n", av[0]);
+                        printf("%s [-s] <config>\n", av[0]);
                         exit(0);
                 }
                 name = av[2];
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index d5daa7af8b49..91ca126ea080 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -21,9 +21,7 @@ static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c;
 extern "C" {
 #endif
 
-#define P(name,type,arg)        extern type name arg
 #include "lkc_proto.h"
-#undef P
 
 #define SRCTREE "srctree"
 
@@ -70,9 +68,6 @@ struct kconf_id {
         enum symbol_type stype;
 };
 
-extern int zconfdebug;
-
-int zconfparse(void);
 void zconfdump(FILE *out);
 void zconf_starthelp(void);
 FILE *zconf_fopen(const char *name);
@@ -90,11 +85,6 @@ void sym_add_change_count(int count);
 bool conf_set_all_new_symbols(enum conf_def_mode mode);
 void set_all_choice_values(struct symbol *csym);
 
-struct conf_printer {
-        void (*print_symbol)(FILE *, struct symbol *, const char *, void *);
-        void (*print_comment)(FILE *, const char *, void *);
-};
-
 /* confdata.c and expr.c */
 static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out)
 {
@@ -113,7 +103,6 @@ void menu_add_entry(struct symbol *sym);
 void menu_end_entry(void);
 void menu_add_dep(struct expr *dep);
 void menu_add_visibility(struct expr *dep);
-struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep);
 struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep);
 void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep);
 void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep);
@@ -137,7 +126,6 @@ struct gstr {
         int max_width;
 };
 struct gstr str_new(void);
-struct gstr str_assign(const char *s);
 void str_free(struct gstr *gs);
 void str_append(struct gstr *gs, const char *s);
 void str_printf(struct gstr *gs, const char *fmt, ...);
@@ -148,8 +136,6 @@ extern struct expr *sym_env_list;
 
 void sym_init(void);
 void sym_clear_all_valid(void);
-void sym_set_all_changed(void);
-void sym_set_changed(struct symbol *sym);
 struct symbol *sym_choice_default(struct symbol *sym);
 const char *sym_get_string_default(struct symbol *sym);
 struct symbol *sym_check_deps(struct symbol *sym);
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
index ecdb9659b67d..d5398718ec2a 100644
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -1,57 +1,52 @@
 #include <stdarg.h>
 
 /* confdata.c */
-P(conf_parse,void,(const char *name));
-P(conf_read,int,(const char *name));
-P(conf_read_simple,int,(const char *name, int));
-P(conf_write_defconfig,int,(const char *name));
-P(conf_write,int,(const char *name));
-P(conf_write_autoconf,int,(void));
-P(conf_get_changed,bool,(void));
-P(conf_set_changed_callback, void,(void (*fn)(void)));
-P(conf_set_message_callback, void,(void (*fn)(const char *fmt, va_list ap)));
+void conf_parse(const char *name);
+int conf_read(const char *name);
+int conf_read_simple(const char *name, int);
+int conf_write_defconfig(const char *name);
+int conf_write(const char *name);
+int conf_write_autoconf(void);
+bool conf_get_changed(void);
+void conf_set_changed_callback(void (*fn)(void));
+void conf_set_message_callback(void (*fn)(const char *fmt, va_list ap));
 
 /* menu.c */
-P(rootmenu,struct menu,);
+extern struct menu rootmenu;
 
-P(menu_is_empty, bool, (struct menu *menu));
-P(menu_is_visible, bool, (struct menu *menu));
-P(menu_has_prompt, bool, (struct menu *menu));
-P(menu_get_prompt,const char *,(struct menu *menu));
-P(menu_get_root_menu,struct menu *,(struct menu *menu));
-P(menu_get_parent_menu,struct menu *,(struct menu *menu));
-P(menu_has_help,bool,(struct menu *menu));
-P(menu_get_help,const char *,(struct menu *menu));
-P(get_symbol_str, void, (struct gstr *r, struct symbol *sym, struct list_head
-                         *head));
-P(get_relations_str, struct gstr, (struct symbol **sym_arr, struct list_head
-                                   *head));
-P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help));
+bool menu_is_empty(struct menu *menu);
+bool menu_is_visible(struct menu *menu);
+bool menu_has_prompt(struct menu *menu);
+const char * menu_get_prompt(struct menu *menu);
+struct menu * menu_get_root_menu(struct menu *menu);
+struct menu * menu_get_parent_menu(struct menu *menu);
+bool menu_has_help(struct menu *menu);
+const char * menu_get_help(struct menu *menu);
+struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head);
+void menu_get_ext_help(struct menu *menu, struct gstr *help);
 
 /* symbol.c */
-P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]);
+extern struct symbol * symbol_hash[SYMBOL_HASHSIZE];
 
-P(sym_lookup,struct symbol *,(const char *name, int flags));
-P(sym_find,struct symbol *,(const char *name));
-P(sym_expand_string_value,const char *,(const char *in));
-P(sym_escape_string_value, const char *,(const char *in));
-P(sym_re_search,struct symbol **,(const char *pattern));
-P(sym_type_name,const char *,(enum symbol_type type));
-P(sym_calc_value,void,(struct symbol *sym));
-P(sym_get_type,enum symbol_type,(struct symbol *sym));
-P(sym_tristate_within_range,bool,(struct symbol *sym,tristate tri));
-P(sym_set_tristate_value,bool,(struct symbol *sym,tristate tri));
-P(sym_toggle_tristate_value,tristate,(struct symbol *sym));
-P(sym_string_valid,bool,(struct symbol *sym, const char *newval));
-P(sym_string_within_range,bool,(struct symbol *sym, const char *str));
-P(sym_set_string_value,bool,(struct symbol *sym, const char *newval));
-P(sym_is_changable,bool,(struct symbol *sym));
-P(sym_get_choice_prop,struct property *,(struct symbol *sym));
-P(sym_get_default_prop,struct property *,(struct symbol *sym));
-P(sym_get_string_value,const char *,(struct symbol *sym));
+struct symbol * sym_lookup(const char *name, int flags);
+struct symbol * sym_find(const char *name);
+const char * sym_expand_string_value(const char *in);
+const char * sym_escape_string_value(const char *in);
+struct symbol ** sym_re_search(const char *pattern);
+const char * sym_type_name(enum symbol_type type);
+void sym_calc_value(struct symbol *sym);
+enum symbol_type sym_get_type(struct symbol *sym);
+bool sym_tristate_within_range(struct symbol *sym,tristate tri);
+bool sym_set_tristate_value(struct symbol *sym,tristate tri);
+tristate sym_toggle_tristate_value(struct symbol *sym);
+bool sym_string_valid(struct symbol *sym, const char *newval);
+bool sym_string_within_range(struct symbol *sym, const char *str);
+bool sym_set_string_value(struct symbol *sym, const char *newval);
+bool sym_is_changable(struct symbol *sym);
+struct property * sym_get_choice_prop(struct symbol *sym);
+const char * sym_get_string_value(struct symbol *sym);
 
-P(prop_get_type_name,const char *,(enum prop_type type));
+const char * prop_get_type_name(enum prop_type type);
 
 /* expr.c */
-P(expr_compare_type,int,(enum expr_type t1, enum expr_type t2));
-P(expr_print,void,(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken));
+void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken);
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 4dd37552abc2..315ce2c7cb9d 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -279,6 +279,7 @@ static int child_count;
 static int single_menu_mode;
 static int show_all_options;
 static int save_and_exit;
+static int silent;
 
 static void conf(struct menu *menu, struct menu *active_menu);
 static void conf_choice(struct menu *menu);
@@ -777,10 +778,12 @@ static void conf_message_callback(const char *fmt, va_list ap)
         char buf[PATH_MAX+1];
 
         vsnprintf(buf, sizeof(buf), fmt, ap);
-        if (save_and_exit)
-                printf("%s", buf);
-        else
+        if (save_and_exit) {
+                if (!silent)
+                        printf("%s", buf);
+        } else {
                 show_textbox(NULL, buf, 6, 60);
+        }
 }
 
 static void show_help(struct menu *menu)
@@ -977,16 +980,18 @@ static int handle_exit(void)
                 }
                 /* fall through */
         case -1:
-                printf(_("\n\n"
-                         "*** End of the configuration.\n"
-                         "*** Execute 'make' to start the build or try 'make help'."
-                         "\n\n"));
+                if (!silent)
+                        printf(_("\n\n"
+                                 "*** End of the configuration.\n"
+                                 "*** Execute 'make' to start the build or try 'make help'."
+                                 "\n\n"));
                 res = 0;
                 break;
         default:
-                fprintf(stderr, _("\n\n"
-                                  "Your configuration changes were NOT saved."
-                                  "\n\n"));
+                if (!silent)
+                        fprintf(stderr, _("\n\n"
+                                          "Your configuration changes were NOT saved."
+                                          "\n\n"));
                 if (res != KEY_ESC)
                         res = 0;
         }
@@ -1010,6 +1015,12 @@ int main(int ac, char **av)
 
         signal(SIGINT, sig_handler);
 
+        if (ac > 1 && strcmp(av[1], "-s") == 0) {
+                silent = 1;
+                /* Silence conf_read() until the real callback is set up */
+                conf_set_message_callback(NULL);
+                av++;
+        }
         conf_parse(av[1]);
         conf_read(NULL);
 
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 72c9dba84c5d..b05cc3d4a9be 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -125,7 +125,7 @@ void menu_set_type(int type)
                 sym_type_name(sym->type), sym_type_name(type));
 }
 
-struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep)
+static struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep)
 {
         struct property *prop = prop_alloc(type, current_entry->sym);
 
@@ -615,7 +615,7 @@ static struct property *get_symbol_prop(struct symbol *sym)
 /*
  * head is optional and may be NULL
  */
-void get_symbol_str(struct gstr *r, struct symbol *sym,
+static void get_symbol_str(struct gstr *r, struct symbol *sym,
                     struct list_head *head)
 {
         bool hit;
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 2ab91b9b100d..ec8e20350a64 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -35,7 +35,7 @@ usage() {
         echo "  -O    dir to put generated output files"
 }
 
-MAKE=true
+RUNMAKE=true
 ALLTARGET=alldefconfig
 WARNREDUN=false
 OUTPUT=.
@@ -48,7 +48,7 @@ while true; do
                 continue
                 ;;
         "-m")
-                MAKE=false
+                RUNMAKE=false
                 shift
                 continue
                 ;;
@@ -85,6 +85,11 @@ fi
 INITFILE=$1
 shift;
 
+if [ ! -r "$INITFILE" ]; then
+        echo "The base file '$INITFILE' does not exist.  Exit." >&2
+        exit 1
+fi
+
 MERGE_LIST=$*
 SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
 TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
@@ -92,31 +97,29 @@ TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
 echo "Using $INITFILE as base"
 cat $INITFILE > $TMP_FILE
 
-# Merge files, printing warnings on overrided values
+# Merge files, printing warnings on overridden values
 for MERGE_FILE in $MERGE_LIST ; do
         echo "Merging $MERGE_FILE"
         CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)
 
         for CFG in $CFG_LIST ; do
-                grep -q -w $CFG $TMP_FILE
-                if [ $? -eq 0 ] ; then
-                        PREV_VAL=$(grep -w $CFG $TMP_FILE)
-                        NEW_VAL=$(grep -w $CFG $MERGE_FILE)
-                        if [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
+                grep -q -w $CFG $TMP_FILE || continue
+                PREV_VAL=$(grep -w $CFG $TMP_FILE)
+                NEW_VAL=$(grep -w $CFG $MERGE_FILE)
+                if [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
                         echo Value of $CFG is redefined by fragment $MERGE_FILE:
                         echo Previous  value: $PREV_VAL
                         echo New value:       $NEW_VAL
                         echo
-                        elif [ "$WARNREDUN" = "true" ]; then
+                elif [ "$WARNREDUN" = "true" ]; then
                         echo Value of $CFG is redundant by fragment $MERGE_FILE:
-                        fi
-                        sed -i "/$CFG[ =]/d" $TMP_FILE
                 fi
+                sed -i "/$CFG[ =]/d" $TMP_FILE
         done
         cat $MERGE_FILE >> $TMP_FILE
 done
 
-if [ "$MAKE" = "false" ]; then
+if [ "$RUNMAKE" = "false" ]; then
         cp $TMP_FILE $OUTPUT/.config
         echo "#"
         echo "# merged configuration written to $OUTPUT/.config (needs make)"
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 984489ef2b46..d42d534a66cd 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -1482,6 +1482,11 @@ int main(int ac, char **av)
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
 
+        if (ac > 1 && strcmp(av[1], "-s") == 0) {
+                /* Silence conf_read() until the real callback is set up */
+                conf_set_message_callback(NULL);
+                av++;
+        }
         conf_parse(av[1]);
         conf_read(NULL);
 
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 9d3b04b0769c..c3bb7fe8dfa6 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1746,7 +1746,7 @@ static const char *progname;
 
 static void usage(void)
 {
-        printf(_("%s <config>\n"), progname);
+        printf(_("%s [-s] <config>\n"), progname);
         exit(0);
 }
 
@@ -1762,6 +1762,9 @@ int main(int ac, char** av)
         configApp = new QApplication(ac, av);
         if (ac > 1 && av[1][0] == '-') {
                 switch (av[1][1]) {
+                case 's':
+                        conf_set_message_callback(NULL);
+                        break;
                 case 'h':
                 case '?':
                         usage();
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 7caabdb51c64..6731377f9bb2 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -112,7 +112,7 @@ struct property *sym_get_env_prop(struct symbol *sym)
         return NULL;
 }
 
-struct property *sym_get_default_prop(struct symbol *sym)
+static struct property *sym_get_default_prop(struct symbol *sym)
 {
         struct property *prop;
 
@@ -186,6 +186,26 @@ static void sym_validate_range(struct symbol *sym)
         sym->curr.val = strdup(str);
 }
 
+static void sym_set_changed(struct symbol *sym)
+{
+        struct property *prop;
+
+        sym->flags |= SYMBOL_CHANGED;
+        for (prop = sym->prop; prop; prop = prop->next) {
+                if (prop->menu)
+                        prop->menu->flags |= MENU_CHANGED;
+        }
+}
+
+static void sym_set_all_changed(void)
+{
+        struct symbol *sym;
+        int i;
+
+        for_all_symbols(i, sym)
+                sym_set_changed(sym);
+}
+
 static void sym_calc_visibility(struct symbol *sym)
 {
         struct property *prop;
@@ -451,26 +471,6 @@ void sym_clear_all_valid(void)
                 sym_calc_value(modules_sym);
 }
 
-void sym_set_changed(struct symbol *sym)
-{
-        struct property *prop;
-
-        sym->flags |= SYMBOL_CHANGED;
-        for (prop = sym->prop; prop; prop = prop->next) {
-                if (prop->menu)
-                        prop->menu->flags |= MENU_CHANGED;
-        }
-}
-
-void sym_set_all_changed(void)
-{
-        struct symbol *sym;
-        int i;
-
-        for_all_symbols(i, sym)
-                sym_set_changed(sym);
-}
-
 bool sym_tristate_within_range(struct symbol *sym, tristate val)
 {
         int type = sym_get_type(sym);
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index 94f9c83e324f..0e76042473cc 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -88,16 +88,6 @@ struct gstr str_new(void)
         return gs;
 }
 
-/* Allocate and assign growable string */
-struct gstr str_assign(const char *s)
-{
-        struct gstr gs;
-        gs.s = strdup(s);
-        gs.len = strlen(s) + 1;
-        gs.max_width = 0;
-        return gs;
-}
-
 /* Free storage for growable string */
 void str_free(struct gstr *gs)
 {