Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d72681d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 762fb1dd e125096e

Documentation/kbuild/kconfig.txt

+2 −9
Original line number Diff line number Diff line
@@ -20,16 +20,9 @@ symbols have been introduced. 
To see a list of new config symbols when using "make oldconfig", use



	cp user/some/old.config .config

	yes "" | make oldconfig >conf.new

	make listnewconfig



and the config program will list as (NEW) any new symbols that have

unknown values.  Of course, the .config file is also updated with

new (default) values, so you can use:



	grep "(NEW)" conf.new



to see the new config symbols or you can use diffconfig to see the

differences between the previous and new .config files:

and the config program will list any new symbols, one per line.



	scripts/diffconfig .config.old .config | less

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -4808,9 +4808,10 @@ S: Maintained 
F:	drivers/staging/ktap/



KCONFIG

M:	Michal Marek <mmarek@suse.cz>

M:	"Yann E. MORIN" <yann.morin.1998@free.fr>

L:	linux-kbuild@vger.kernel.org

S:	Odd Fixes

T:	git://gitorious.org/linux-kconfig/linux-kconfig

S:	Maintained

F:	Documentation/kbuild/kconfig-language.txt

F:	scripts/kconfig/

scripts/kconfig/expr.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ struct symbol { 
#define SYMBOL_CHOICEVAL  0x0020  /* used as a value in a choice block */

#define SYMBOL_VALID      0x0080  /* set when symbol.curr is calculated */

#define SYMBOL_OPTIONAL   0x0100  /* choice is optional - values can be 'n' */

#define SYMBOL_WRITE      0x0200  /* ? */

#define SYMBOL_WRITE      0x0200  /* write symbol to file (KCONFIG_CONFIG) */

#define SYMBOL_CHANGED    0x0400  /* ? */

#define SYMBOL_AUTO       0x1000  /* value from environment variable */

#define SYMBOL_CHECKED    0x2000  /* used during dependency checking */

scripts/kconfig/mconf.c

+29 −31
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
static const char mconf_readme[] = N_(

"Overview\n"

"--------\n"

"This interface let you select features and parameters for the build.\n"

"This interface lets you select features and parameters for the build.\n"

"Features can either be built-in, modularized, or ignored. Parameters\n"

"must be entered in as decimal or hexadecimal numbers or text.\n"

"\n"
@@ -39,15 +39,15 @@ static const char mconf_readme[] = N_( 
"\n"

"To change any of these features, highlight it with the cursor\n"

"keys and press <Y> to build it in, <M> to make it a module or\n"

"<N> to removed it.  You may also press the <Space Bar> to cycle\n"

"through the available options (ie. Y->N->M->Y).\n"

"<N> to remove it.  You may also press the <Space Bar> to cycle\n"

"through the available options (i.e. Y->N->M->Y).\n"

"\n"

"Some additional keyboard hints:\n"

"\n"

"Menus\n"

"----------\n"

"o  Use the Up/Down arrow keys (cursor keys) to highlight the item\n"

"   you wish to change or submenu wish to select and press <Enter>.\n"

"o  Use the Up/Down arrow keys (cursor keys) to highlight the item you\n"

"   wish to change or the submenu you wish to select and press <Enter>.\n"

"   Submenus are designated by \"--->\", empty ones by \"----\".\n"

"\n"

"   Shortcut: Press the option's highlighted letter (hotkey).\n"
@@ -65,7 +65,7 @@ static const char mconf_readme[] = N_( 
"             there is a delayed response which you may find annoying.\n"

"\n"

"   Also, the <TAB> and cursor keys will cycle between <Select>,\n"

"   <Exit> and <Help>.\n"

"   <Exit>, <Help>, <Save>, and <Load>.\n"

"\n"

"o  To get help with an item, use the cursor keys to highlight <Help>\n"

"   and press <ENTER>.\n"
@@ -117,23 +117,21 @@ static const char mconf_readme[] = N_( 
"those who, for various reasons, find it necessary to switch\n"

"between different configurations.\n"

"\n"

"At the end of the main menu you will find two options.  One is\n"

"for saving the current configuration to a file of your choosing.\n"

"The other option is for loading a previously saved alternate\n"

"configuration.\n"

"The <Save> button will let you save the current configuration to\n"

"a file of your choosing.  Use the <Load> button to load a previously\n"

"saved alternate configuration.\n"

"\n"

"Even if you don't use alternate configuration files, but you\n"

"find during a Menuconfig session that you have completely messed\n"

"up your settings, you may use the \"Load Alternate...\" option to\n"

"restore your previously saved settings from \".config\" without\n"

"restarting Menuconfig.\n"

"Even if you don't use alternate configuration files, but you find\n"

"during a Menuconfig session that you have completely messed up your\n"

"settings, you may use the <Load> button to restore your previously\n"

"saved settings from \".config\" without restarting Menuconfig.\n"

"\n"

"Other information\n"

"-----------------\n"

"If you use Menuconfig in an XTERM window make sure you have your\n"

"$TERM variable set to point to a xterm definition which supports color.\n"

"Otherwise, Menuconfig will look rather bad.  Menuconfig will not\n"

"display correctly in a RXVT window because rxvt displays only one\n"

"If you use Menuconfig in an XTERM window, make sure you have your\n"

"$TERM variable set to point to an xterm definition which supports\n"

"color.  Otherwise, Menuconfig will look rather bad.  Menuconfig will\n"

"not display correctly in an RXVT window because rxvt displays only one\n"

"intensity of color, bright.\n"

"\n"

"Menuconfig will display larger menus on screens or xterms which are\n"
@@ -148,8 +146,8 @@ static const char mconf_readme[] = N_( 
"\n"

"Optional personality available\n"

"------------------------------\n"

"If you prefer to have all of the options listed in a single menu, rather\n"

"than the default multimenu hierarchy, run the menuconfig with\n"

"If you prefer to have all of the options listed in a single menu,\n"

"rather than the default multimenu hierarchy, run the menuconfig with\n"

"MENUCONFIG_MODE environment variable set to single_menu. Example:\n"

"\n"

"make MENUCONFIG_MODE=single_menu menuconfig\n"
@@ -172,7 +170,7 @@ static const char mconf_readme[] = N_( 
" mono       => selects colors suitable for monochrome displays\n"

" blackbg    => selects a color scheme with black background\n"

" classic    => theme with blue background. The classic look\n"

" bluetitle  => a LCD friendly version of classic. (default)\n"

" bluetitle  => an LCD friendly version of classic. (default)\n"

"\n"),

menu_instructions[] = N_(

	"Arrow keys navigate the menu.  "
@@ -238,24 +236,24 @@ search_help[] = N_( 
	"Symbol: FOO [=m]\n"

	"Type  : tristate\n"

	"Prompt: Foo bus is used to drive the bar HW\n"

	"  Defined at drivers/pci/Kconfig:47\n"

	"  Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"

	"  Location:\n"

	"    -> Bus options (PCI, PCMCIA, EISA, ISA)\n"

	"      -> PCI support (PCI [=y])\n"

	"(1)     -> PCI access mode (<choice> [=y])\n"

	"  Defined at drivers/pci/Kconfig:47\n"

	"  Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"

	"  Selects: LIBCRC32\n"

	"  Selected by: BAR\n"

	"  Selected by: BAR [=n]\n"

	"-----------------------------------------------------------------\n"

	"o The line 'Type:' shows the type of the configuration option for\n"

	"  this symbol (boolean, tristate, string, ...)\n"

	"o The line 'Prompt:' shows the text used in the menu structure for\n"

	"  this symbol\n"

	"o The 'Defined at' line tell at what file / line number the symbol\n"

	"o The 'Defined at' line tells at what file / line number the symbol\n"

	"  is defined\n"

	"o The 'Depends on:' line tell what symbols needs to be defined for\n"

	"o The 'Depends on:' line tells what symbols need to be defined for\n"

	"  this symbol to be visible in the menu (selectable)\n"

	"o The 'Location:' lines tell where in the menu structure this symbol\n"

	"o The 'Location:' lines tells where in the menu structure this symbol\n"

	"  is located\n"

	"    A location followed by a [=y] indicates that this is a\n"

	"    selectable menu item - and the current value is displayed inside\n"
@@ -263,9 +261,9 @@ search_help[] = N_( 
	"    Press the key in the (#) prefix to jump directly to that\n"

	"    location. You will be returned to the current search results\n"

	"    after exiting this new menu.\n"

	"o The 'Selects:' line tell what symbol will be automatically\n"

	"o The 'Selects:' line tells what symbols will be automatically\n"

	"  selected if this symbol is selected (y or m)\n"

	"o The 'Selected by' line tell what symbol has selected this symbol\n"

	"o The 'Selected by' line tells what symbol has selected this symbol\n"

	"\n"

	"Only relevant lines are shown.\n"

	"\n\n"

scripts/kconfig/menu.c

+6 −5
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ void menu_set_type(int type) 
		sym->type = type;

		return;

	}

	menu_warn(current_entry, "type of '%s' redefined from '%s' to '%s'",

	menu_warn(current_entry,

		"ignoring type redefinition of '%s' from '%s' to '%s'",

		sym->name ? sym->name : "<choice>",

		sym_type_name(sym->type), sym_type_name(type));

}
@@ -583,7 +584,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop, 
		for (j = 4; --i >= 0; j += 2) {

			menu = submenu[i];

			if (head && location && menu == location)

				jump->offset = r->len - 1;

				jump->offset = strlen(r->s);

			str_printf(r, "%*c-> %s", j, ' ',

				   _(menu_get_prompt(menu)));

			if (menu->sym) {
@@ -597,7 +598,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop, 
}



/*

 * get peoperty of type P_SYMBOL

 * get property of type P_SYMBOL

 */

static struct property *get_symbol_prop(struct symbol *sym)

{