Kconfig: sync with linux kernel v2.6.35-4771-g1787985

this will add also the support of the new ncurse interface nconfig

---
 Makefile                                   |    2 +-
 common/Kconfig                             |   13 +
 scripts/kconfig/.gitignore                 |    4 +
 scripts/kconfig/Makefile                   |  175 ++-
 scripts/kconfig/POTFILES.in                |    7 +
 scripts/kconfig/check.sh                   |   14 +
 scripts/kconfig/conf.c                     |  424 ++++----
 scripts/kconfig/confdata.c                 |  506 ++++++---
 scripts/kconfig/expr.c                     |   63 +-
 scripts/kconfig/expr.h                     |  106 ++-
 scripts/kconfig/gconf.c                    |  145 +--
 scripts/kconfig/gconf.glade                |   30 +-
 scripts/kconfig/kxgettext.c                |    8 +-
 scripts/kconfig/lex.zconf.c_shipped        |  127 ++-
 scripts/kconfig/lkc.h                      |   30 +-
 scripts/kconfig/lkc_proto.h                |    9 +-
 scripts/kconfig/lxdialog/BIG.FAT.WARNING   |    2 +-
 scripts/kconfig/lxdialog/check-lxdialog.sh |   20 +-
 scripts/kconfig/lxdialog/checklist.c       |   17 +-
 scripts/kconfig/lxdialog/dialog.h          |   11 +-
 scripts/kconfig/lxdialog/inputbox.c        |   10 +-
 scripts/kconfig/lxdialog/menubox.c         |   28 +-
 scripts/kconfig/lxdialog/textbox.c         |    2 +-
 scripts/kconfig/lxdialog/util.c            |   34 +-
 scripts/kconfig/lxdialog/yesno.c           |    4 +-
 scripts/kconfig/mconf.c                    |  262 ++---
 scripts/kconfig/menu.c                     |  211 +++-
 scripts/kconfig/nconf.c                    | 1568 ++++++++++++++++++++++++++
 scripts/kconfig/nconf.gui.c                |  617 ++++++++++
 scripts/kconfig/nconf.h                    |   95 ++
 scripts/kconfig/qconf.cc                   |  255 +++--
 scripts/kconfig/qconf.h                    |   17 +-
 scripts/kconfig/streamline_config.pl       |  422 +++++++
 scripts/kconfig/symbol.c                   |  501 +++++++--
 scripts/kconfig/util.c                     |   44 +-
 scripts/kconfig/zconf.gperf                |    6 +-
 scripts/kconfig/zconf.hash.c_shipped       |  225 ++--
 scripts/kconfig/zconf.l                    |   21 +-
 scripts/kconfig/zconf.tab.c_shipped        | 1665 +++++++++++++++-------------
 scripts/kconfig/zconf.y                    |   62 +-
 40 files changed, 5758 insertions(+), 2004 deletions(-)
 create mode 100755 scripts/kconfig/check.sh
 create mode 100644 scripts/kconfig/nconf.c
 create mode 100644 scripts/kconfig/nconf.gui.c
 create mode 100644 scripts/kconfig/nconf.h
 create mode 100644 scripts/kconfig/streamline_config.pl

index 8a09f32..8dc9981 100644
@@ -305,7 +305,7 @@ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
 KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
 export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
-export ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
+export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
 export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE
 export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
 

index c07c638..6556c62 100644
@@ -1,3 +1,16 @@
+config ARCH
+	string
+	option env="ARCH"
+
+config KERNELVERSION
+	string
+	option env="KERNELVERSION"
+
+config DEFCONFIG_LIST
+	string
+	option defconfig_list
+	default "$ARCH_DEFCONFIG"
+	default "arch/$ARCH/defconfig"
 
 config GREGORIAN_CALENDER
 	bool

index b49584c..624f650 100644
@@ -8,12 +8,16 @@ lex.*.c
 zconf.hash.c
 *.moc
 lkc_defs.h
+gconf.glade.h
+*.pot
+*.mo
 
 #
 # configuration programs
 #
 conf
 mconf
+nconf
 qconf
 gconf
 kxgettext

index cc94e46..9674573 100644
@@ -1,5 +1,12 @@
+scripts/kconfig/lxdialog/checklist.c
+scripts/kconfig/lxdialog/inputbox.c
+scripts/kconfig/lxdialog/menubox.c
+scripts/kconfig/lxdialog/textbox.c
+scripts/kconfig/lxdialog/util.c
+scripts/kconfig/lxdialog/yesno.c
 scripts/kconfig/mconf.c
 scripts/kconfig/conf.c
 scripts/kconfig/confdata.c
 scripts/kconfig/gconf.c
+scripts/kconfig/gconf.glade.h
 scripts/kconfig/qconf.cc

new file mode 100755
index 0000000..fa59cbf
@@ -0,0 +1,14 @@
+#!/bin/sh
+# Needed for systems without gettext
+$* -xc -o /dev/null - > /dev/null 2>&1 << EOF
+#include <libintl.h>
+int main()
+{
+	gettext("");
+	return 0;
+}
+EOF
+if [ ! "$?" -eq "0"  ]; then
+	echo -DKBUILD_NO_NLS;
+fi
+

index 803233f..d52b0a7 100644
@@ -190,26 +190,40 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkCheckMenuItem" id="show_all_options1">
+		    <widget class="GtkRadioMenuItem" id="set_option_mode1">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Show normal options</property>
+		      <property name="label" translatable="yes">Show normal options</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">True</property>
+		      <signal name="activate" handler="on_set_option_mode1_activate"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkRadioMenuItem" id="set_option_mode2">
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Show all options</property>
 		      <property name="label" translatable="yes">Show all _options</property>
 		      <property name="use_underline">True</property>
 		      <property name="active">False</property>
-		      <signal name="activate" handler="on_show_all_options1_activate"/>
+		      <property name="group">set_option_mode1</property>
+		      <signal name="activate" handler="on_set_option_mode2_activate"/>
 		    </widget>
 		  </child>
 
 		  <child>
-		    <widget class="GtkCheckMenuItem" id="show_debug_info1">
+		    <widget class="GtkRadioMenuItem" id="set_option_mode3">
 		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Show masked options</property>
-		      <property name="label" translatable="yes">Show _debug info</property>
+		      <property name="tooltip" translatable="yes">Show all options with prompts</property>
+		      <property name="label" translatable="yes">Show all prompt options</property>
 		      <property name="use_underline">True</property>
 		      <property name="active">False</property>
-		      <signal name="activate" handler="on_show_debug_info1_activate"/>
+		      <property name="group">set_option_mode1</property>
+		      <signal name="activate" handler="on_set_option_mode3_activate"/>
 		    </widget>
 		  </child>
+
 		</widget>
 	      </child>
 	    </widget>

@@ -547,7 +561,7 @@
 		  <property name="headers_visible">True</property>
 		  <property name="rules_hint">False</property>
 		  <property name="reorderable">False</property>
-		  <property name="enable_search">True</property>
+		  <property name="enable_search">False</property>
 		  <signal name="cursor_changed" handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003 15:58:22 GMT"/>
 		  <signal name="button_press_event" handler="on_treeview1_button_press_event" last_modification_time="Sun, 12 Jan 2003 16:03:52 GMT"/>
 		  <signal name="key_press_event" handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003 16:11:44 GMT"/>

@@ -582,7 +596,7 @@
 		      <property name="headers_visible">True</property>
 		      <property name="rules_hint">False</property>
 		      <property name="reorderable">False</property>
-		      <property name="enable_search">True</property>
+		      <property name="enable_search">False</property>
 		      <signal name="cursor_changed" handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003 15:57:55 GMT"/>
 		      <signal name="button_press_event" handler="on_treeview2_button_press_event" last_modification_time="Sun, 12 Jan 2003 15:57:58 GMT"/>
 		      <signal name="key_press_event" handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003 15:58:01 GMT"/>

index 6eb72a7..dcc3fcc 100644
@@ -43,6 +43,10 @@ static char *escape(const char* text, char *bf, int len)
 			++text;
 			goto next;
 		}
+		else if (*text == '\\') {
+			*bfp++ = '\\';
+			len--;
+		}
 		*bfp++ = *text++;
 next:
 		--len;

@@ -162,7 +166,7 @@ static int message__add(const char *msg, char *option, char *file, int lineno)
 	return rc;
 }
 
-void menu_build_message_list(struct menu *menu)
+static void menu_build_message_list(struct menu *menu)
 {
 	struct menu *child;
 

@@ -207,7 +211,7 @@ static void message__print_gettext_msgid_msgstr(struct message *self)
 	       "msgstr \"\"\n", self->msg);
 }
 
-void menu__xgettext(void)
+static void menu__xgettext(void)
 {
 	struct message *m = message__list;
 

index 8a07ee4..76db065 100644
@@ -11,9 +11,9 @@
 #ifndef KBUILD_NO_NLS
 # include <libintl.h>
 #else
-# define gettext(Msgid) ((const char *) (Msgid))
-# define textdomain(Domainname) ((const char *) (Domainname))
-# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
+static inline const char *gettext(const char *txt) { return txt; }
+static inline void textdomain(const char *domainname) {}
+static inline void bindtextdomain(const char *name, const char *dir) {}
 #endif
 
 #ifdef __cplusplus

@@ -42,8 +42,17 @@ extern "C" {
 #define TF_PARAM	0x0002
 #define TF_OPTION	0x0004
 
+enum conf_def_mode {
+	def_default,
+	def_yes,
+	def_mod,
+	def_no,
+	def_random
+};
+
 #define T_OPT_MODULES		1
 #define T_OPT_DEFCONFIG_LIST	2
+#define T_OPT_ENV		3
 
 struct kconf_id {
 	int name;

@@ -65,15 +74,18 @@ char *zconf_curname(void);
 
 /* confdata.c */
 const char *conf_get_configname(void);
+const char *conf_get_autoconfig_name(void);
 char *conf_get_default_confname(void);
 void sym_set_change_count(int count);
 void sym_add_change_count(int count);
+void conf_set_all_new_symbols(enum conf_def_mode mode);
 
 /* kconfig_load.c */
 void kconfig_load(void);
 
 /* menu.c */
-void menu_init(void);
+void _menu_init(void);
+void menu_warn(struct menu *menu, const char *fmt, ...);
 struct menu *menu_add_menu(void);
 void menu_end_menu(void);
 void menu_add_entry(struct symbol *sym);

@@ -94,6 +106,11 @@ int file_write_dep(const char *name);
 struct gstr {
 	size_t len;
 	char  *s;
+	/*
+	* when max_width is not zero long lines in string s (if any) get
+	* wrapped not to exceed the max_width value
+	*/
+	int max_width;
 };
 struct gstr str_new(void);
 struct gstr str_assign(const char *s);

@@ -103,13 +120,18 @@ void str_printf(struct gstr *gs, const char *fmt, ...);
 const char *str_get(struct gstr *gs);
 
 /* symbol.c */
+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);
 struct property *prop_alloc(enum prop_type type, struct symbol *sym);
 struct symbol *prop_get_symbol(struct property *prop);
+struct property *sym_get_env_prop(struct symbol *sym);
 
 static inline tristate sym_get_tristate_value(struct symbol *sym)
 {

index 4d09f6d..9a948c9 100644
@@ -3,6 +3,7 @@
 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));

@@ -11,17 +12,21 @@ P(conf_set_changed_callback, void,(void (*fn)(void)));
 /* menu.c */
 P(rootmenu,struct menu,);
 
-P(menu_is_visible,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));
+P(get_relations_str, struct gstr, (struct symbol **sym_arr));
+P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help));
 
 /* symbol.c */
 P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]);
 
-P(sym_lookup,struct symbol *,(const char *name, int isconst));
+P(sym_lookup,struct symbol *,(const char *name, int flags));
 P(sym_find,struct symbol *,(const char *name));
 P(sym_re_search,struct symbol **,(const char *pattern));
 P(sym_type_name,const char *,(enum symbol_type type));

index a8999d8..d8601eb 100644
@@ -1,4 +1,4 @@
 This is NOT the official version of dialog.  This version has been
 significantly modified from the original.  It is for use by the Linux
-kernel configuration script.  Please do not bother Savio Lam with 
+barebox configuration script.  Please do not bother Savio Lam with 
 questions about this program.

index 9681476..fcef0f5 100644
@@ -36,19 +36,23 @@ trap "rm -f $tmp" 0 1 2 3 15
 
 # Check if we can link to ncurses
 check() {
-	echo "main() {}" | $cc -xc - -o $tmp 2> /dev/null
+        $cc -xc - -o $tmp 2>/dev/null <<'EOF'
+#include CURSES_LOC
+main() {}
+EOF
 	if [ $? != 0 ]; then
-		echo " *** Unable to find the ncurses libraries."          1>&2
-		echo " *** make menuconfig require the ncurses libraries"  1>&2
-		echo " *** "                                               1>&2
-		echo " *** Install ncurses (ncurses-devel) and try again"  1>&2
-		echo " *** "                                               1>&2
-		exit 1
+	    echo " *** Unable to find the ncurses libraries or the"       1>&2
+	    echo " *** required header files."                            1>&2
+	    echo " *** 'make menuconfig' requires the ncurses libraries." 1>&2
+	    echo " *** "                                                  1>&2
+	    echo " *** Install ncurses (ncurses-devel) and try again."    1>&2
+	    echo " *** "                                                  1>&2
+	    exit 1
 	fi
 }
 
 usage() {
-	printf "Usage: $0 [-check compiler options|-header|-library]\n"
+	printf "Usage: $0 [-check compiler options|-ccflags|-ldflags compiler options]\n"
 }
 
 if [ $# -eq 0 ]; then

index cf69708..a2eb80f 100644
@@ -31,6 +31,10 @@ static int list_width, check_x, item_x;
 static void print_item(WINDOW * win, int choice, int selected)
 {
 	int i;
+	char *list_item = malloc(list_width + 1);
+
+	strncpy(list_item, item_str(), list_width - item_x);
+	list_item[list_width - item_x] = '\0';
 
 	/* Clear 'residue' of last item */
 	wattrset(win, dlg.menubox.atr);

@@ -41,16 +45,18 @@ static void print_item(WINDOW * win, int choice, int selected)
 	wmove(win, choice, check_x);
 	wattrset(win, selected ? dlg.check_selected.atr
 		 : dlg.check.atr);
-	wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' ');
+	if (!item_is_tag(':'))
+		wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' ');
 
 	wattrset(win, selected ? dlg.tag_selected.atr : dlg.tag.atr);
-	mvwaddch(win, choice, item_x, item_str()[0]);
+	mvwaddch(win, choice, item_x, list_item[0]);
 	wattrset(win, selected ? dlg.item_selected.atr : dlg.item.atr);
-	waddstr(win, (char *)item_str() + 1);
+	waddstr(win, list_item + 1);
 	if (selected) {
 		wmove(win, choice, check_x + 1);
 		wrefresh(win);
 	}
+	free(list_item);
 }
 
 /*

@@ -97,8 +103,8 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected)
 	int x = width / 2 - 11;
 	int y = height - 2;
 
-	print_button(dialog, "Select", y, x, selected == 0);
-	print_button(dialog, " Help ", y, x + 14, selected == 1);
+	print_button(dialog, gettext("Select"), y, x, selected == 0);
+	print_button(dialog, gettext(" Help "), y, x + 14, selected == 1);
 
 	wmove(dialog, y, x + 1 + 14 * selected);
 	wrefresh(dialog);

@@ -174,6 +180,7 @@ do_resize:
 	check_x = 0;
 	item_foreach()
 		check_x = MAX(check_x, strlen(item_str()) + 4);
+	check_x = MIN(check_x, list_width);
 
 	check_x = (list_width - check_x) / 2;
 	item_x = check_x + 4;

index 7e17eba..b5211fc 100644
@@ -26,6 +26,12 @@
 #include <string.h>
 #include <stdbool.h>
 
+#ifndef KBUILD_NO_NLS
+# include <libintl.h>
+#else
+# define gettext(Msgid) ((const char *) (Msgid))
+#endif
+
 #ifdef __sun__
 #define CURS_MACROS
 #endif

@@ -187,10 +193,9 @@ int item_is_tag(char tag);
 int on_key_esc(WINDOW *win);
 int on_key_resize(void);
 
-void init_dialog(const char *backtitle);
+int init_dialog(const char *backtitle);
 void set_dialog_backtitle(const char *backtitle);
-void reset_dialog(void);
-void end_dialog(void);
+void end_dialog(int x, int y);
 void attr_clear(WINDOW * win, int height, int width, chtype attr);
 void dialog_clear(void);
 void print_autowrap(WINDOW * win, const char *prompt, int width, int y, int x);

index 05e7206..dd8e587 100644
@@ -31,8 +31,8 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected)
 	int x = width / 2 - 11;
 	int y = height - 2;
 
-	print_button(dialog, "  Ok  ", y, x, selected == 0);
-	print_button(dialog, " Help ", y, x + 14, selected == 1);
+	print_button(dialog, gettext("  Ok  "), y, x, selected == 0);
+	print_button(dialog, gettext(" Help "), y, x + 14, selected == 1);
 
 	wmove(dialog, y, x + 1 + 14 * selected);
 	wrefresh(dialog);

@@ -89,7 +89,7 @@ do_resize:
 	box_y = y + 2;
 	box_x = (width - box_width) / 2;
 	draw_box(dialog, y + 1, box_x - 1, 3, box_width + 2,
-		 dlg.border.atr, dlg.dialog.atr);
+		 dlg.dialog.atr, dlg.border.atr);
 
 	print_buttons(dialog, height, width, 0);
 

@@ -180,7 +180,7 @@ do_resize:
 		case KEY_LEFT:
 			switch (button) {
 			case -1:
-				button = 1;	/* Indicates "Cancel" button is selected */
+				button = 1;	/* Indicates "Help" button is selected */
 				print_buttons(dialog, height, width, 1);
 				break;
 			case 0:

@@ -204,7 +204,7 @@ do_resize:
 				print_buttons(dialog, height, width, 0);
 				break;
 			case 0:
-				button = 1;	/* Indicates "Cancel" button is selected */
+				button = 1;	/* Indicates "Help" button is selected */
 				print_buttons(dialog, height, width, 1);
 				break;
 			case 1:

index 0d83159..1d60473 100644
@@ -157,9 +157,9 @@ static void print_buttons(WINDOW * win, int height, int width, int selected)
 	int x = width / 2 - 16;
 	int y = height - 2;
 
-	print_button(win, "Select", y, x, selected == 0);
-	print_button(win, " Exit ", y, x + 12, selected == 1);
-	print_button(win, " Help ", y, x + 24, selected == 2);
+	print_button(win, gettext("Select"), y, x, selected == 0);
+	print_button(win, gettext(" Exit "), y, x + 12, selected == 1);
+	print_button(win, gettext(" Help "), y, x + 24, selected == 2);
 
 	wmove(win, y, x + 1 + 12 * selected);
 	wrefresh(win);

@@ -383,6 +383,10 @@ do_resize:
 		case 'n':
 		case 'm':
 		case '/':
+		case 'h':
+		case '?':
+		case 'z':
+		case '\n':
 			/* save scroll info */
 			*s_scroll = scroll;
 			delwin(menu);

@@ -390,8 +394,10 @@ do_resize:
 			item_set(scroll + choice);
 			item_set_selected(1);
 			switch (key) {
+			case 'h':
+			case '?':
+				return 2;
 			case 's':
-				return 3;
 			case 'y':
 				return 3;
 			case 'n':

@@ -402,18 +408,12 @@ do_resize:
 				return 6;
 			case '/':
 				return 7;
+			case 'z':
+				return 8;
+			case '\n':
+				return button;
 			}
 			return 0;
-		case 'h':
-		case '?':
-			button = 2;
-		case '\n':
-			*s_scroll = scroll;
-			delwin(menu);
-			delwin(dialog);
-			item_set(scroll + choice);
-			item_set_selected(1);
-			return button;
 		case 'e':
 		case 'x':
 			key = KEY_ESC;

index fabfc1a..c704712 100644
@@ -114,7 +114,7 @@ do_resize:
 
 	print_title(dialog, title, width);
 
-	print_button(dialog, " Exit ", height - 2, width / 2 - 4, TRUE);
+	print_button(dialog, gettext(" Exit "), height - 2, width / 2 - 4, TRUE);
 	wnoutrefresh(dialog);
 	getyx(dialog, cur_y, cur_x);	/* Save cursor position */
 

index a1bddef..f2375ad 100644
@@ -19,6 +19,8 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdarg.h>
+
 #include "dialog.h"
 
 struct dialog_info dlg;

@@ -266,31 +268,41 @@ void dialog_clear(void)
 /*
  * Do some initialization for dialog
  */
-void init_dialog(const char *backtitle)
+int init_dialog(const char *backtitle)
 {
-	dlg.backtitle = backtitle;
-	color_setup(getenv("MENUCONFIG_COLOR"));
-}
+	int height, width;
+
+	initscr();		/* Init curses */
+	getmaxyx(stdscr, height, width);
+	if (height < 19 || width < 80) {
+		endwin();
+		return -ERRDISPLAYTOOSMALL;
+	}
 
-void set_dialog_backtitle(const char *backtitle)
-{
 	dlg.backtitle = backtitle;
-}
+	color_setup(getenv("MENUCONFIG_COLOR"));
 
-void reset_dialog(void)
-{
-	initscr();		/* Init curses */
 	keypad(stdscr, TRUE);
 	cbreak();
 	noecho();
 	dialog_clear();
+
+	return 0;
+}
+
+void set_dialog_backtitle(const char *backtitle)
+{
+	dlg.backtitle = backtitle;
 }
 
 /*
  * End using dialog functions.
  */
-void end_dialog(void)
+void end_dialog(int x, int y)
 {
+	/* move cursor back to original position */
+	move(y, x);
+	refresh();
 	endwin();
 }
 

index ee0a04e..4e6e809 100644
@@ -29,8 +29,8 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected)
 	int x = width / 2 - 10;
 	int y = height - 2;
 
-	print_button(dialog, " Yes ", y, x, selected == 0);
-	print_button(dialog, "  No  ", y, x + 13, selected == 1);
+	print_button(dialog, gettext(" Yes "), y, x, selected == 0);
+	print_button(dialog, gettext("  No  "), y, x + 13, selected == 1);
 
 	wmove(dialog, y, x + 1 + 13 * selected);
 	wrefresh(dialog);

index b3b5657..636a74b 100644

index 9b44c80..d8bc742 100644

index 187d38c..7ad18f7 100644

1.7.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Part of the diff is not shown here. View the raw message.

Hi Jean-Christophe.

[jc - sorry for the duplicate.
I forgot to delete the patch and have cancelled
the mail to the mailing list. (too big)
]

In the kconfig land we are workng on an enhancement to nconf so we replace the "use first or second char in menu as hotkey". The initial reason why we started this was that people
did not like that some menus had the second char capitalized like this:

"mOdule support"

The reason why "O" is capital and not "m" is that "m" hotkey is already in use. And we use the capital letter to signal the relevant hotkey.
menuconfig does so using a different color, but the high level ncurses interface nconfig uses does not allow this.

We are also working on a fix to savedefconfig. savedefconfig is a new target used to save a minimal config.

So all-in-all I would like to see this sync happen either a bit later this kernel cycle, or that you resync again later in this cycle.

Which bring up another question.
We have plenty of projects out there that rely on kconfig.
What can we do to kconfig to make the integration easier?

We have discussed that kconfig should be a seperate installable tool (as rpm, deb whatever).
But there is a few quirks needed before we can do so.

But are there any other thing we could do to
make life easier for external users?

Sam

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Hi sam,

I notice this and does not like it also
why not underline it?

I prefer to umbedeed it is the source so we can control which version we use and no need to rely on too much external stuff

infact yes if the project name could be configurable it will avoid to modify it and we could use it as is

I've notice 3 names

kernel,
Kernel,
Linux Kernel

if instead of hard coding it we could use a symbol to configure it it will make it integrable as is

one other think it will be good to avoid KERNEL something in the env or the default symbol and use a more generic one as for KERNELVERSION use RELEASEVERSION as example

also a small doc for the mandatory env and symbol will be nice for people to integrate it as not everyone is also a kernel dev or maintainer

and a last thing It will be nice to be able to set a value to a symbol from an other one and not only select it

Best Regards,
J.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

That was not possible with the high-level interface nconfig uses. Nir used a new approach where he uses an interactive search and the interactive search will match any menu containing the string entered.

More powerfull than the hot-key support, and more flexible.

OK, I will drop any thinking of packaging it as an external tool. [I was not sure how to do this so glad to drop it].

They should obviously go. I have had patches to do so before but I did not like them so they never got applied.
I will try to cook up something and let see what Michal thinks. [Michal takes care of kconfig these days, I just do some random patches when I feel in the mode to do so].

I actually take this that integrating kconfig should be simpler. So it:
a) should be documented using a HOW-TO
b) we sould rely on very little outside scripts/kconfig

The primary 'customer' is the kernel but it would be good to generalize stuff a bit more.
This is by far the biggest task listed.
I will add it to my mental TODO list - but no promises :-)

I am not sure I see how this is usefull.
Can you give me an example.

Note: We recently had a patch where "select" was extended to specify an optional value.
But my issue with that was that I failed to see the use of it so I was not happy with the extension.

But I may have missed something!

Thanks for the quick feedback!

Sam

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

for barebox point of view just be able to change the projects name will be enough as most of us if not all are kernel dev or maintainer

ok take a look on arch/arm/mach-at91/Kconfig

as example for the

config BOARDINFO

        default "Atmel at91rm9200-ek" if MACH_AT91RM9200EK
        default "Atmel 91SAM9260-EK" if MACH_AT91SAM9260EK
        default "Atmel at91sam9261-ek" if MACH_AT91SAM9261EK
        default "Atmel at91sam9263-ek" if MACH_AT91SAM9263EK
        default "Bucyrus MMC-CPU" if MACH_MMCCPU
        default "Ronetix PM9261" if MACH_PM9261
        default "Ronetix PM9263" if MACH_PM9263

if you change the board via the interface it will not be change and it will the same for config ARCH_TEXT_BASE in some case

and I'll prefer to do set BOARDINFO="Atmel at91rm9200-ek" from the config MACH_AT91RM9200EK

hope it will be a good example

Best Regards,
J.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

The solution I have in mind is to try to add the relevant information to the Kconfig files.

Today the title is hardcoded in the frontends (menuconfig, nconfig etc). We could instead pick this up from the mainmenu entry.

So we in a Kconfig file could have:

mainmenu "My application configuration - version $VERSION"

config VERSION
string
option env=VERSION

The text in mainmenu will have all references to $SOMETHING expanded to the string representation of that symbol.

And we can use existing functionality to pick up environment variables.

The frontends needs to be adapted as well as the kconfig backend.

But doing the above I guess we have 'fixed' almost all kernel references.

Sam

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

I like it

and how about the new set/select option I mention also?

because I also take a look in the kernel for ARM as example and it will be usefull to simplify it

Best Regards,
J.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Have not considered it yet.
As it is a new feature I decided to look into some of the bugs first. And I consider the harcoding of "kernel" as a bug.

Sam

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Hi Sam,

ptxdist as well.

I don't think that it is necessary. Last time I checked the most complicated thing was to exchange the project name ("Linux kernel") to something else, because there were quite a lot of hand coded numbers representing the string length or length-1. But we are not up to the latest versions - I'll have to re-check.

rsc

Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

[Sorry, old thread - Been away on vacation]

Robert> ptxdist as well.

And Buildroot and OpenWrt and crosstool-ng, ...

Robert> I don't think that it is necessary. Last time I checked the most Robert> complicated thing was to exchange the project name ("Linux kernel") to Robert> something else, because there were quite a lot of hand coded numbers Robert> representing the string length or length-1. But we are not up to the Robert> latest versions - I'll have to re-check.

Yeah. Buildroot has historically done s/CONFIG_/BR2_/ as well, but I'm strongly considering going back to CONFIG_.

Bye, Peter Korsgaard

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

I agree too

Best Regards,
J.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

is it ok to apply it?

Best Regards,
J.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Generally ok, yes. I just thought we should wait a little for a later version, or have I misunderstood Sam?

Sascha

Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Current state of kconfig in v2.6.36-rc1 (which is a later version than the one Jean-Christophe references) is the following:
- savedefconfig bugs fixed
- reading a minimal config (created by savedefconfig) fixed

The nconfig issues I mentioned regarding search are not yet ready.
And I am not sure if they go in until next merge window.

Likewise there are patches in the works that will ease the integration with external projects.
The patches does the following:
- Allows the prefix to be configured (CONFIG_ => BR2_)
- No more hardcoded "kernel" strings
- mainmenu in the config file is used as headline

These patches will go in during next merge window if they are finished in due time.

So all-in-all I would recommend to use kconfig from v2.6.36-rc1 (rather than some random commit) and then upgrade again around v2.6.37-rc1 time.

Sam

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

ok I upgrade the patch

and it will be good to update it regulary I will follow it is there a ML for Kconfig?

Best Regards,
J.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

kconfig is mostly discussed on [email protected] but sometimes also/only on lkml.

On lkml this is usually stuff that is a bit remote to kconfig. It was on lkml the defconfigs was discussed which triggered "savedefconfig".

Sam

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Hi,

Sam> Current state of kconfig in v2.6.36-rc1 (which is a later version Sam> than the one Jean-Christophe references) is the following: - Sam> savedefconfig bugs fixed - reading a minimal config (created by Sam> savedefconfig) fixed

Sam> The nconfig issues I mentioned regarding search are Sam> not yet ready.
Sam> And I am not sure if they go in until next merge window.

Sam> Likewise there are patches in the works that will ease Sam> the integration with external projects.
Sam> The patches does the following:
Sam> - Allows the prefix to be configured (CONFIG_ => BR2_) Sam> - No more hardcoded "kernel" strings
Sam> - mainmenu in the config file is used as headline

Sam> These patches will go in during next merge window if they Sam> are finished in due time.

Nice! FYI, I'm planning on syncing kconfig for buildroot after the 2010.08 release.

Bye, Peter Korsgaard

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Hi Sam,

Just in case you run out of ideas, one thing that I would really like to have is a "Go there" button in the search results. I often want to change one symbol. The easiest way to do this (apart from editing .config directly) would be:

make menuorwhateverconfig
/CONFIG_FOO
"Go there"
enable it
quit+save

Or better:

make menuorwhateverconfig
/CONFIG_FOO
"enable"

OK, it's not that easy as FOO might have dependencies that even might not be fulfillable, but still, I'd like it.

And there is IMHO a bug in Kconfig. If I search for "CONFIG_LL" I get a long list starting with:

	CPU_LLSERIAL_S3C2440_ONLY
	S3C_GPIO_PULL_UP
	S3C2440_PLL_16934400
	USB_GADGET_LANGWELL
	MACH_ARMADILLO5X0

If I had to guess what the problem is, I'd say that kconfig strips "CONFIG_" before searching. It should better search for ^LL instead of LL, no?

Best regards
Uwe

Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Hi,

I've push the new version on git://git.jcrosoft.org kconfig

The following changes since commit 77df62be5d5140b083152316d67a756d9fae962c:

beagle: fix usb dependencies (2010-08-18 08:47:33 +0200)

are available in the git repository at:
git://git.jcrosoft.org/barebox.git kconfig

Jean-Christophe PLAGNIOL-VILLARD (1):

      Kconfig: sync with linux kernel v2.6.36-rc1-168-ge36c886

 Makefile                                   |    2 +-
 common/Kconfig                             |   13 +
 scripts/kconfig/.gitignore                 |    4 +
 scripts/kconfig/Makefile                   |  175 ++-
 scripts/kconfig/POTFILES.in                |    7 +
 scripts/kconfig/check.sh                   |   14 +
 scripts/kconfig/conf.c                     |  439 ++++----
 scripts/kconfig/confdata.c                 |  537 +++++++---
 scripts/kconfig/expr.c                     |   65 +-
 scripts/kconfig/expr.h                     |  106 ++-
 scripts/kconfig/gconf.c                    |  145 +--
 scripts/kconfig/gconf.glade                |   30 +-
 scripts/kconfig/kxgettext.c                |    8 +-
 scripts/kconfig/lex.zconf.c_shipped        |  127 ++-
 scripts/kconfig/lkc.h                      |   40 +-
 scripts/kconfig/lkc_proto.h                |    9 +-
 scripts/kconfig/lxdialog/BIG.FAT.WARNING   |    2 +-
 scripts/kconfig/lxdialog/check-lxdialog.sh |   20 +-
 scripts/kconfig/lxdialog/checklist.c       |   17 +-
 scripts/kconfig/lxdialog/dialog.h          |   11 +-
 scripts/kconfig/lxdialog/inputbox.c        |   10 +-
 scripts/kconfig/lxdialog/menubox.c         |   28 +-
 scripts/kconfig/lxdialog/textbox.c         |    2 +-
 scripts/kconfig/lxdialog/util.c            |   34 +-
 scripts/kconfig/lxdialog/yesno.c           |    4 +-
 scripts/kconfig/mconf.c                    |  262 ++---
 scripts/kconfig/menu.c                     |  211 +++-
 scripts/kconfig/nconf.c                    | 1570 ++++++++++++++++++++++++++
 scripts/kconfig/nconf.gui.c                |  617 ++++++++++
 scripts/kconfig/nconf.h                    |   95 ++
 scripts/kconfig/qconf.cc                   |  255 +++--
 scripts/kconfig/qconf.h                    |   17 +-
 scripts/kconfig/streamline_config.pl       |  422 +++++++
 scripts/kconfig/symbol.c                   |  501 +++++++--
 scripts/kconfig/util.c                     |   44 +-
 scripts/kconfig/zconf.gperf                |    6 +-
 scripts/kconfig/zconf.hash.c_shipped       |  225 ++--
 scripts/kconfig/zconf.l                    |   21 +-
 scripts/kconfig/zconf.tab.c_shipped        | 1665 +++++++++++++++-------------
 scripts/kconfig/zconf.y                    |   62 +-
 40 files changed, 5815 insertions(+), 2007 deletions(-)
 create mode 100755 scripts/kconfig/check.sh
 create mode 100644 scripts/kconfig/nconf.c
 create mode 100644 scripts/kconfig/nconf.gui.c
 create mode 100644 scripts/kconfig/nconf.h
 create mode 100644 scripts/kconfig/streamline_config.pl

Best Regards,
J.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox