Merge branch 'yem/kconfig-for-next' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/kconfig

Michal Marek committed 13 years ago

Commit e1250962 parents 5eb1f99 00d4f8f8 files · +45 −48Browse files

Unified · Split

8 files

Documentation/kbuild/kconfig.txt +2 −9
scripts/kconfig/expr.h +1 −1
scripts/kconfig/mconf.c +29 −31
scripts/kconfig/menu.c +6 −5
scripts/kconfig/qconf.cc +5 −0
scripts/kconfig/qconf.h +1 −0
scripts/kconfig/symbol.c +1 −1
scripts/kconfig/zconf.l +0 −1

@@ -20,16 +20,9 @@ symbols have been introduced. · 19 unmodified lines
20	20	To see a list of new config symbols when using "make oldconfig", use
21	21
22	22	cp user/some/old.config .config
23		− yes "" \| make oldconfig >conf.new
	23	+ make listnewconfig
24	24
25		−and the config program will list as (NEW) any new symbols that have
26		−unknown values. Of course, the .config file is also updated with
27		−new (default) values, so you can use:
28		−
29		− grep "(NEW)" conf.new
30		−
31		−to see the new config symbols or you can use diffconfig to see the
32		−differences between the previous and new .config files:
	25	+and the config program will list any new symbols, one per line.
33	26
34	27	scripts/diffconfig .config.old .config \| less
35	28

scripts/kconfig/expr.h+1−1

@@ -93,7 +93,7 @@ struct symbol { · 92 unmodified lines
93	93	#define SYMBOL_CHOICEVAL 0x0020 /* used as a value in a choice block */
94	94	#define SYMBOL_VALID 0x0080 /* set when symbol.curr is calculated */
95	95	#define SYMBOL_OPTIONAL 0x0100 /* choice is optional - values can be 'n' */
96		−#define SYMBOL_WRITE 0x0200 /* ? */
	96	+#define SYMBOL_WRITE 0x0200 /* write symbol to file (KCONFIG_CONFIG) */
97	97	#define SYMBOL_CHANGED 0x0400 /* ? */
98	98	#define SYMBOL_AUTO 0x1000 /* value from environment variable */
99	99	#define SYMBOL_CHECKED 0x2000 /* used during dependency checking */

scripts/kconfig/mconf.c+29−31

@@ -25,7 +25,7 @@ · 24 unmodified lines
25	25	static const char mconf_readme[] = N_(
26	26	"Overview\n"
27	27	"--------\n"
28		−"This interface let you select features and parameters for the build.\n"
	28	+"This interface lets you select features and parameters for the build.\n"
29	29	"Features can either be built-in, modularized, or ignored. Parameters\n"
30	30	"must be entered in as decimal or hexadecimal numbers or text.\n"
31	31	"\n"
@@ -39,15 +39,15 @@ static const char mconf_readme[] = N_( · 7 unmodified lines
39	39	"\n"
40	40	"To change any of these features, highlight it with the cursor\n"
41	41	"keys and press <Y> to build it in, <M> to make it a module or\n"
42		−"<N> to removed it. You may also press the <Space Bar> to cycle\n"
43		−"through the available options (ie. Y->N->M->Y).\n"
	42	+"<N> to remove it. You may also press the <Space Bar> to cycle\n"
	43	+"through the available options (i.e. Y->N->M->Y).\n"
44	44	"\n"
45	45	"Some additional keyboard hints:\n"
46	46	"\n"
47	47	"Menus\n"
48	48	"----------\n"
49		−"o Use the Up/Down arrow keys (cursor keys) to highlight the item\n"
50		−" you wish to change or submenu wish to select and press <Enter>.\n"
	49	+"o Use the Up/Down arrow keys (cursor keys) to highlight the item you\n"
	50	+" wish to change or the submenu you wish to select and press <Enter>.\n"
51	51	" Submenus are designated by \"--->\", empty ones by \"----\".\n"
52	52	"\n"
53	53	" Shortcut: Press the option's highlighted letter (hotkey).\n"
@@ -65,7 +65,7 @@ static const char mconf_readme[] = N_( · 11 unmodified lines
65	65	" there is a delayed response which you may find annoying.\n"
66	66	"\n"
67	67	" Also, the <TAB> and cursor keys will cycle between <Select>,\n"
68		−" <Exit> and <Help>.\n"
	68	+" <Exit>, <Help>, <Save>, and <Load>.\n"
69	69	"\n"
70	70	"o To get help with an item, use the cursor keys to highlight <Help>\n"
71	71	" and press <ENTER>.\n"
@@ -105,7 +105,7 @@ static const char mconf_readme[] = N_( · 33 unmodified lines
105	105	"Text Box (Help Window)\n"
106	106	"--------\n"
107	107	"o Use the cursor keys to scroll up/down/left/right. The VI editor\n"
108		−" keys h,j,k,l function here as do <u>, <d>, <SPACE BAR> and <B> for \n"
	108	+" keys h,j,k,l function here as do <u>, <d>, <SPACE BAR> and <B> for\n"
109	109	" those who are familiar with less and lynx.\n"
110	110	"\n"
111	111	"o Press <E>, <X>, <q>, <Enter> or <Esc><Esc> to exit.\n"
@@ -117,23 +117,21 @@ static const char mconf_readme[] = N_( · 5 unmodified lines
117	117	"those who, for various reasons, find it necessary to switch\n"
118	118	"between different configurations.\n"
119	119	"\n"
120		−"At the end of the main menu you will find two options. One is\n"
121		−"for saving the current configuration to a file of your choosing.\n"
122		−"The other option is for loading a previously saved alternate\n"
123		−"configuration.\n"
	120	+"The <Save> button will let you save the current configuration to\n"
	121	+"a file of your choosing. Use the <Load> button to load a previously\n"
	122	+"saved alternate configuration.\n"
124	123	"\n"
125		−"Even if you don't use alternate configuration files, but you\n"
126		−"find during a Menuconfig session that you have completely messed\n"
127		−"up your settings, you may use the \"Load Alternate...\" option to\n"
128		−"restore your previously saved settings from \".config\" without\n"
129		−"restarting Menuconfig.\n"
	124	+"Even if you don't use alternate configuration files, but you find\n"
	125	+"during a Menuconfig session that you have completely messed up your\n"
	126	+"settings, you may use the <Load> button to restore your previously\n"
	127	+"saved settings from \".config\" without restarting Menuconfig.\n"
130	128	"\n"
131	129	"Other information\n"
132	130	"-----------------\n"
133		−"If you use Menuconfig in an XTERM window make sure you have your\n"
134		−"$TERM variable set to point to a xterm definition which supports color.\n"
135		−"Otherwise, Menuconfig will look rather bad. Menuconfig will not\n"
136		−"display correctly in a RXVT window because rxvt displays only one\n"
	131	+"If you use Menuconfig in an XTERM window, make sure you have your\n"
	132	+"$TERM variable set to point to an xterm definition which supports\n"
	133	+"color. Otherwise, Menuconfig will look rather bad. Menuconfig will\n"
	134	+"not display correctly in an RXVT window because rxvt displays only one\n"
137	135	"intensity of color, bright.\n"
138	136	"\n"
139	137	"Menuconfig will display larger menus on screens or xterms which are\n"
@@ -148,8 +146,8 @@ static const char mconf_readme[] = N_( · 8 unmodified lines
148	146	"\n"
149	147	"Optional personality available\n"
150	148	"------------------------------\n"
151		−"If you prefer to have all of the options listed in a single menu, rather\n"
152		−"than the default multimenu hierarchy, run the menuconfig with\n"
	149	+"If you prefer to have all of the options listed in a single menu,\n"
	150	+"rather than the default multimenu hierarchy, run the menuconfig with\n"
153	151	"MENUCONFIG_MODE environment variable set to single_menu. Example:\n"
154	152	"\n"
155	153	"make MENUCONFIG_MODE=single_menu menuconfig\n"
@@ -172,7 +170,7 @@ static const char mconf_readme[] = N_( · 16 unmodified lines
172	170	" mono => selects colors suitable for monochrome displays\n"
173	171	" blackbg => selects a color scheme with black background\n"
174	172	" classic => theme with blue background. The classic look\n"
175		−" bluetitle => a LCD friendly version of classic. (default)\n"
	173	+" bluetitle => an LCD friendly version of classic. (default)\n"
176	174	"\n"),
177	175	menu_instructions[] = N_(
178	176	"Arrow keys navigate the menu. "
@@ -238,24 +236,24 @@ search_help[] = N_( · 59 unmodified lines
238	236	"Symbol: FOO [=m]\n"
239	237	"Type : tristate\n"
240	238	"Prompt: Foo bus is used to drive the bar HW\n"
241		− " Defined at drivers/pci/Kconfig:47\n"
242		− " Depends on: X86_LOCAL_APIC && X86_IO_APIC \|\| IA64\n"
243	239	" Location:\n"
244	240	" -> Bus options (PCI, PCMCIA, EISA, ISA)\n"
245	241	" -> PCI support (PCI [=y])\n"
246	242	"(1) -> PCI access mode (<choice> [=y])\n"
	243	+ " Defined at drivers/pci/Kconfig:47\n"
	244	+ " Depends on: X86_LOCAL_APIC && X86_IO_APIC \|\| IA64\n"
247	245	" Selects: LIBCRC32\n"
248		− " Selected by: BAR\n"
	246	+ " Selected by: BAR [=n]\n"
249	247	"-----------------------------------------------------------------\n"
250	248	"o The line 'Type:' shows the type of the configuration option for\n"
251	249	" this symbol (boolean, tristate, string, ...)\n"
252	250	"o The line 'Prompt:' shows the text used in the menu structure for\n"
253	251	" this symbol\n"
254		− "o The 'Defined at' line tell at what file / line number the symbol\n"
	252	+ "o The 'Defined at' line tells at what file / line number the symbol\n"
255	253	" is defined\n"
256		− "o The 'Depends on:' line tell what symbols needs to be defined for\n"
	254	+ "o The 'Depends on:' line tells what symbols need to be defined for\n"
257	255	" this symbol to be visible in the menu (selectable)\n"
258		− "o The 'Location:' lines tell where in the menu structure this symbol\n"
	256	+ "o The 'Location:' lines tells where in the menu structure this symbol\n"
259	257	" is located\n"
260	258	" A location followed by a [=y] indicates that this is a\n"
261	259	" selectable menu item - and the current value is displayed inside\n"
@@ -263,9 +261,9 @@ search_help[] = N_( · 1 unmodified line
263	261	" Press the key in the (#) prefix to jump directly to that\n"
264	262	" location. You will be returned to the current search results\n"
265	263	" after exiting this new menu.\n"
266		− "o The 'Selects:' line tell what symbol will be automatically\n"
	264	+ "o The 'Selects:' line tells what symbols will be automatically\n"
267	265	" selected if this symbol is selected (y or m)\n"
268		− "o The 'Selected by' line tell what symbol has selected this symbol\n"
	266	+ "o The 'Selected by' line tells what symbol has selected this symbol\n"
269	267	"\n"
270	268	"Only relevant lines are shown.\n"
271	269	"\n\n"

scripts/kconfig/menu.c+6−5

@@ -119,9 +119,10 @@ void menu_set_type(int type) · 118 unmodified lines
119	119	sym->type = type;
120	120	return;
121	121	}
122		− menu_warn(current_entry, "type of '%s' redefined from '%s' to '%s'",
123		− sym->name ? sym->name : "<choice>",
124		− sym_type_name(sym->type), sym_type_name(type));
	122	+ menu_warn(current_entry,
	123	+ "ignoring type redefinition of '%s' from '%s' to '%s'",
	124	+ sym->name ? sym->name : "<choice>",
	125	+ sym_type_name(sym->type), sym_type_name(type));
125	126	}
126	127
127	128	struct property menu_add_prop(enum prop_type type, char prompt, struct expr expr, struct expr dep)
@@ -583,7 +584,7 @@ static void get_prompt_str(struct gstr r, struct property prop, · 455 unmodified lines
583	584	for (j = 4; --i >= 0; j += 2) {
584	585	menu = submenu[i];
585	586	if (head && location && menu == location)
586		− jump->offset = r->len - 1;
	587	+ jump->offset = strlen(r->s);
587	588	str_printf(r, "%*c-> %s", j, ' ',
588	589	_(menu_get_prompt(menu)));
589	590	if (menu->sym) {
@@ -597,7 +598,7 @@ static void get_prompt_str(struct gstr r, struct property prop, · 7 unmodified lines
597	598	}
598	599
599	600	/*
600		− * get peoperty of type P_SYMBOL
	601	+ * get property of type P_SYMBOL
601	602	*/
602	603	static struct property get_symbol_prop(struct symbol sym)
603	604	{

scripts/kconfig/qconf.cc+5−0

@@ -69,6 +69,11 @@ static inline QString qgettext(const QString& str) · 68 unmodified lines
69	69	return QString::fromLocal8Bit(gettext(str.latin1()));
70	70	}
71	71
	72	+ConfigSettings::ConfigSettings()
	73	+ : QSettings("kernel.org", "qconf")
	74	+{
	75	+}
	76	+
72	77	/**
73	78	* Reads a list of integer values from the application settings.
74	79	*/

scripts/kconfig/qconf.h+1−0

@@ -32,6 +32,7 @@ class ConfigMainWindow; · 31 unmodified lines
32	32
33	33	class ConfigSettings : public QSettings {
34	34	public:
	35	+ ConfigSettings();
35	36	Q3ValueList<int> readSizes(const QString& key, bool *ok);
36	37	bool writeSizes(const QString& key, const Q3ValueList<int>& value);
37	38	};

scripts/kconfig/symbol.c+1−1

@@ -1047,7 +1047,7 @@ sym_re_search_free: · 1046 unmodified lines
1047	1047	* When we check for recursive dependencies we use a stack to save
1048	1048	* current state so we can print out relevant info to user.
1049	1049	* The entries are located on the call stack so no need to free memory.
1050		− * Note inser() remove() must always match to properly clear the stack.
	1050	+ * Note insert() remove() must always match to properly clear the stack.
1051	1051	*/
1052	1052	static struct dep_stack {
1053	1053	struct dep_stack prev, next;

scripts/kconfig/zconf.l+0−1

@@ -68,7 +68,6 @@ static void alloc_string(const char *str, int size) · 67 unmodified lines
68	68	}
69	69	%}
70	70
71		−ws [ \n\t]
72	71	n [A-Za-z0-9_]
73	72
74	73	%%

Merge branch 'yem/kconfig-for-next' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/kconfig

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code