Commit d72681d7c61f32a89147b8867cfb80e4ea119972
Exists in
master
and in
16 other branches
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kconfig changes from Michal Marek: - xconfig stores its setting in a meaningful path (~/.config/kernel.org/qconf.conf) - kconfig symbol search fix - documentation fixes - cleanup & comment update - fix warning when a kconfig symbol is defined with two different types - Yann is now officially listed as maintainer of kconfig, but he prefers me to send pull requests for now * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: MAINTAINERS: New kconfig maintainer xconfig: Fix the filename for GUI settings kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len kconfig: remove unused definition from scanner kconfig: adjust warning message for conflicting types kconfig: fix trivial typos and update mconf documentation kconfig: add short explanation to SYMBOL_WRITE Documentation/kbuild/kconfig.txt: 'make listnewconfig' replaces: yes "" | make oldconfig
Showing 9 changed files Side-by-side Diff
Documentation/kbuild/kconfig.txt
... | ... | @@ -20,16 +20,9 @@ |
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 |
MAINTAINERS
... | ... | @@ -4808,9 +4808,10 @@ |
4808 | 4808 | F: drivers/staging/ktap/ |
4809 | 4809 | |
4810 | 4810 | KCONFIG |
4811 | -M: Michal Marek <mmarek@suse.cz> | |
4811 | +M: "Yann E. MORIN" <yann.morin.1998@free.fr> | |
4812 | 4812 | L: linux-kbuild@vger.kernel.org |
4813 | -S: Odd Fixes | |
4813 | +T: git://gitorious.org/linux-kconfig/linux-kconfig | |
4814 | +S: Maintained | |
4814 | 4815 | F: Documentation/kbuild/kconfig-language.txt |
4815 | 4816 | F: scripts/kconfig/ |
4816 | 4817 |
scripts/kconfig/expr.h
... | ... | @@ -93,7 +93,7 @@ |
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
... | ... | @@ -25,7 +25,7 @@ |
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" |
32 | 32 | |
... | ... | @@ -39,15 +39,15 @@ |
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 @@ |
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 @@ |
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" |
112 | 112 | |
113 | 113 | |
... | ... | @@ -117,23 +117,21 @@ |
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 @@ |
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 @@ |
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. " |
179 | 177 | |
180 | 178 | |
181 | 179 | |
182 | 180 | |
183 | 181 | |
... | ... | @@ -238,24 +236,24 @@ |
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" |
262 | 260 | |
... | ... | @@ -263,9 +261,9 @@ |
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
... | ... | @@ -119,9 +119,10 @@ |
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 @@ |
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 @@ |
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
scripts/kconfig/qconf.h
scripts/kconfig/symbol.c
... | ... | @@ -1047,7 +1047,7 @@ |
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; |