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

Commit b202c0d5 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 updates from Michal Marek:
 - dependency solver fix for make defconfig
 - randconfig fixes, one of which had to be reverted again
 - more user-friendly sorting of search results
 - hex and range keywords support longs
 - fix for [mn]conf not to rely on particular behavior of the LINES and
   COLS variables
 - cleanup of magic constants in kconfig/lxdialog
 - [mn]conf formatting fixes
 - fix for scripts/config's help text in out-of-tree usage (under a
   different name)

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kconfig: allow "hex" and "range" to support longs
  Revert "kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG"
  kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG
  kconfig: loop as long as we changed some symbols in randconfig
  kconfig/[mn]conf: make it explicit in the search box that a regexp is possible
  kconfig: sort found symbols by relevance
  kconfig/conf: print the seed used to initialise the RNG for randconfig
  kconfig/conf: accept a base-16 seed for randconfig
  kconfig/conf: fix randconfig setting multiple symbols in a choice
  scripts/config: replace hard-coded script name by a dynamic value
  mconf/nconf: mark empty menus/menuconfigs different from non-empty ones
  nconf: use function calls instead of ncurses' variables LINES and COLS
  mconf: use function calls instead of ncurses' variables LINES and COLS
  kconfig/lxdialog: handle newline characters in print_autowrap()
  kconfig/lxdialog: Use new mininimum resize definitions in conf_choice()
  kconfig/lxdialog: Add definitions for mininimum (re)size values
  kconfig: Fix defconfig when one choice menu selects options that another choice menu depends on
parents cb63fc26 b57caaae

Documentation/kbuild/kconfig.txt

+13 −0
Original line number Diff line number Diff line
@@ -174,6 +174,19 @@ Searching in menuconfig: 


		/^hotplug



	When searching, symbols are sorted thus:

	  - exact match first: an exact match is when the search matches

	    the complete symbol name;

	  - alphabetical order: when two symbols do not match exactly,

	    they are sorted in alphabetical order (in the user's current

	    locale).

	For example: ^ATH.K matches:

	    ATH5K ATH9K ATH5K_AHB ATH5K_DEBUG [...] ATH6KL ATH6KL_DEBUG

	    [...] ATH9K_AHB ATH9K_BTCOEX_SUPPORT ATH9K_COMMON [...]

	of which only ATH5K and ATH9K match exactly and so are sorted

	first (and in alphabetical order), then come all other symbols,

	sorted in alphabetical order.



______________________________________________________________________

User interface options for 'menuconfig'

scripts/config

+7 −5
Original line number Diff line number Diff line 
#!/bin/bash

# Manipulate options in a .config file from the command line



myname=${0##*/}



# If no prefix forced, use the default CONFIG_

CONFIG_="${CONFIG_-CONFIG_}"
@@ -8,7 +10,7 @@ usage() { 
	cat >&2 <<EOL

Manipulate options in a .config file from the command line.

Usage:

config options command ...

$myname options command ...

commands:

	--enable|-e option   Enable option

	--disable|-d option  Disable option
@@ -33,14 +35,14 @@ options: 
	--file config-file   .config file to change (default .config)

	--keep-case|-k       Keep next symbols' case (dont' upper-case it)



config doesn't check the validity of the .config file. This is done at next

$myname doesn't check the validity of the .config file. This is done at next

make time.



By default, config will upper-case the given symbol. Use --keep-case to keep

By default, $myname will upper-case the given symbol. Use --keep-case to keep

the case of all following symbols unchanged.



config uses 'CONFIG_' as the default symbol prefix. Set the environment

variable CONFIG_ to the prefix to use. Eg.: CONFIG_="FOO_" config ...

$myname uses 'CONFIG_' as the default symbol prefix. Set the environment

variable CONFIG_ to the prefix to use. Eg.: CONFIG_="FOO_" $myname ...

EOL

	exit 1

}

scripts/kconfig/conf.c

+4 −2
Original line number Diff line number Diff line
@@ -527,11 +527,12 @@ int main(int ac, char **av) 
			seed_env = getenv("KCONFIG_SEED");

			if( seed_env && *seed_env ) {

				char *endp;

				int tmp = (int)strtol(seed_env, &endp, 10);

				int tmp = (int)strtol(seed_env, &endp, 0);

				if (*endp == '\0') {

					seed = tmp;

				}

			}

			fprintf( stderr, "KCONFIG_SEED=0x%X\n", seed );

			srand(seed);

			break;

		}
@@ -653,7 +654,8 @@ int main(int ac, char **av) 
		conf_set_all_new_symbols(def_default);

		break;

	case randconfig:

		conf_set_all_new_symbols(def_random);

		/* Really nothing to do in this loop */

		while (conf_set_all_new_symbols(def_random)) ;

		break;

	case defconfig:

		conf_set_all_new_symbols(def_default);

scripts/kconfig/confdata.c

+26 −7
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ void conf_set_changed_callback(void (*fn)(void)) 
	conf_changed_callback = fn;

}



static void randomize_choice_values(struct symbol *csym)

static bool randomize_choice_values(struct symbol *csym)

{

	struct property *prop;

	struct symbol *sym;
@@ -1053,7 +1053,7 @@ static void randomize_choice_values(struct symbol *csym) 
	 * In both cases stop.

	 */

	if (csym->curr.tri != yes)

		return;

		return false;



	prop = sym_get_choice_prop(csym);
@@ -1077,13 +1077,18 @@ static void randomize_choice_values(struct symbol *csym) 
		else {

			sym->def[S_DEF_USER].tri = no;

		}

		sym->flags |= SYMBOL_DEF_USER;

		/* clear VALID to get value calculated */

		sym->flags &= ~SYMBOL_VALID;

	}

	csym->flags |= SYMBOL_DEF_USER;

	/* clear VALID to get value calculated */

	csym->flags &= ~(SYMBOL_VALID);



	return true;

}



static void set_all_choice_values(struct symbol *csym)

void set_all_choice_values(struct symbol *csym)

{

	struct property *prop;

	struct symbol *sym;
@@ -1100,10 +1105,10 @@ static void set_all_choice_values(struct symbol *csym) 
	}

	csym->flags |= SYMBOL_DEF_USER;

	/* clear VALID to get value calculated */

	csym->flags &= ~(SYMBOL_VALID);

	csym->flags &= ~(SYMBOL_VALID | SYMBOL_NEED_SET_CHOICE_VALUES);

}



void conf_set_all_new_symbols(enum conf_def_mode mode)

bool conf_set_all_new_symbols(enum conf_def_mode mode)

{

	struct symbol *sym, *csym;

	int i, cnt, pby, pty, ptm;	/* pby: probability of boolean  = y
@@ -1151,6 +1156,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode) 
			exit( 1 );

		}

	}

	bool has_changed = false;



	for_all_symbols(i, sym) {

		if (sym_has_value(sym) || (sym->flags & SYMBOL_VALID))
@@ -1158,6 +1164,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode) 
		switch (sym_get_type(sym)) {

		case S_BOOLEAN:

		case S_TRISTATE:

			has_changed = true;

			switch (mode) {

			case def_yes:

				sym->def[S_DEF_USER].tri = yes;
@@ -1202,14 +1209,26 @@ void conf_set_all_new_symbols(enum conf_def_mode mode) 
	 * selected in a choice block and we set it to yes,

	 * and the rest to no.

	 */

	if (mode != def_random) {

		for_all_symbols(i, csym) {

			if ((sym_is_choice(csym) && !sym_has_value(csym)) ||

			    sym_is_choice_value(csym))

				csym->flags |= SYMBOL_NEED_SET_CHOICE_VALUES;

		}

	}



	for_all_symbols(i, csym) {

		if (sym_has_value(csym) || !sym_is_choice(csym))

			continue;



		sym_calc_value(csym);

		if (mode == def_random)

			randomize_choice_values(csym);

		else

			has_changed = randomize_choice_values(csym);

		else {

			set_all_choice_values(csym);

			has_changed = true;

		}

	}



	return has_changed;

}

scripts/kconfig/expr.h

+3 −0
Original line number Diff line number Diff line
@@ -106,6 +106,9 @@ struct symbol { 
#define SYMBOL_DEF3       0x40000  /* symbol.def[S_DEF_3] is valid */

#define SYMBOL_DEF4       0x80000  /* symbol.def[S_DEF_4] is valid */



/* choice values need to be set before calculating this symbol value */

#define SYMBOL_NEED_SET_CHOICE_VALUES  0x100000



#define SYMBOL_MAXLENGTH	256

#define SYMBOL_HASHSIZE		9973