linux-toradex.git/scripts/kconfig, branch T20_LinuxImageV2.0Beta1_20121218

kbuild: Fix help text not displayed in choice option.

2011-11-11T17:44:10+00:00

commit 3f198dfee49d2e9c30583c62b0c79286c78c7b44 upstream.

Help text under choice menu is never displayed because it does not have
symbol name associated with it, however many kconfigs have help text
under choice, assuming that it will be displayed when user selects help.
for example in Kconfig if we have:
choice
        prompt "Choice"
        ---help---
           HELP TEXT ...

config A
        bool "A"

config B
        bool "B"

endchoice

Without this patch "HELP TEXT" is not displayed when user selects help
option when "Choice" is highlighted from menuconfig or xconfig or
gconfig.

This patch changes the logic in menu_get_ext_help to display help for
cases which dont have symbol names like choice.

Signed-off-by: Srinivas Kandagatla 
Reviewed-by: Stuart Menefy 
Reviewed-by: Arnaud Lacombe 
Signed-off-by: Michal Marek 
Signed-off-by: Greg Kroah-Hartman

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

2011-07-30T07:17:06+00:00

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
  kconfig: Introduce IS_ENABLED(), IS_BUILTIN() and IS_MODULE()
  xconfig: Abort close if configuration cannot be saved
  kconfig: fix missing "0x" prefix from S_HEX symbol in autoconf.h
  kconfig/nconf: remove useless conditionnal
  kconfig/nconf: prevent segfault on empty menu
  kconfig/nconf: use the generic menu_get_ext_help()
  nconfig: Avoid Wunused-but-set warning
  kconfig/conf: mark xfgets() private
  kconfig: remove pending prototypes for kconfig_load()
  kconfig/conf: add command line options' description
  kconfig/conf: reduce the scope of `defconfig_file'
  kconfig: use calloc() for expr allocation
  kconfig: introduce specialized printer
  kconfig: do not overwrite symbol direct dependency in assignment
  kconfig/gconf: silent missing prototype warnings
  kconfig/gconf: kill deadcode
  kconfig: nuke LKC_DIRECT_LINK cruft
  kconfig: nuke reference to SWIG
  kconfig: add missing  inclusion
  kconfig: add missing  inclusion
  ...

Fix up conflicts in scripts/kconfig/Makefile

kconfig: Introduce IS_ENABLED(), IS_BUILTIN() and IS_MODULE()

2011-07-29T19:53:30+00:00

Replace the config_is_*() macros with a variant that allows for grepping
for usage of CONFIG_* options in the code. Usage:

  if (IS_ENABLED(CONFIG_NUMA))

or

  #if IS_ENABLED(CONFIG_NUMA)

The IS_ENABLED() macro evaluates to 1 if the argument is set (to either 'y'
or 'm'), IS_BUILTIN() tests if the option is 'y' and IS_MODULE() test if
the option is 'm'. Only boolean and tristate options are supported.

Reviewed-by: Arnaud Lacombe 
Acked-by: Randy Dunlap 
Signed-off-by: Michal Marek

xconfig: Abort close if configuration cannot be saved

2011-07-25T13:50:34+00:00

Give the user an opportunity to fix the error or save the configuration
under a different path.

Reported-by: Hiromu Yakura 
Signed-off-by: Michal Marek

kconfig: fix missing "0x" prefix from S_HEX symbol in autoconf.h

2011-07-18T14:29:29+00:00

The specialized printer for headers (espectially autoconf.h) is missing
fixup code for S_HEX symbol's "0x" prefix. As long as kconfig does not
warn for such missing prefix, this code is needed. Fix this.

In the same time, fix some nits in `header_print_symbol()'.

Cc: Randy Dunlap 
Cc: Mauro Carvalho Chehab 

Broken-by: Arnaud Lacombe 
Reported-by: Randy Dunlap 
Reported-by: Mauro Carvalho Chehab 
Acked-by: Mauro Carvalho Chehab 
Acked-by: Randy Dunlap 
Signed-off-by: Arnaud Lacombe 
Signed-off-by: Michal Marek

kconfig/nconf: remove useless conditionnal

2011-07-13T11:54:01+00:00

After the test

	if (!submenu || ...)
		continue;

the variable `submenu' can _not_ be NULL, so do not test for this
situation.

Cc: Nir Tzachar 
Signed-off-by: Arnaud Lacombe 
Signed-off-by: Michal Marek

kconfig/nconf: prevent segfault on empty menu

2011-07-13T11:48:11+00:00

nconf does not check the validity of the current menu when help is
requested (with either , '?' or 'h'). This leads to a NULL pointer
dereference when an empty menu is encountered.

The following reduced testcase exposes the problem:

config DEP
        bool

menu "FOO"

config BAR
        bool "BAR"
        depends on DEP

endmenu

Issue will happen when entering menu "FOO" and requesting help.

nconf is the only front-end which do not filter the validity of the
current menu. Such filter can not really happen beforehand as other key
which does not deals with the current menu might be entered by the user,
so just bails out earlier if we encounter an invalid menu.

Cc: Nir Tzachar 
Cc: Andrej Gelenberg 
Reported-by: Andrej Gelenberg 
Signed-off-by: Arnaud Lacombe 
Signed-off-by: Michal Marek

kconfig/nconf: use the generic menu_get_ext_help()

2011-07-13T11:48:08+00:00

nconf is the only front-end which does not use this helper, but prefer
to copy/paste the code. The test wrt. menu validity added in this
version of the code is bogus anyway as an invalid menu will get
dereferenced a few line below by calling menu_get_prompt().

For now, convert nconf to use menu_get_ext_help(), as do every other
front-end. We will deals with menu validity checks properly in a
separate commit.

Cc: Nir Tzachar 
Cc: Andrej Gelenberg 
Signed-off-by: Arnaud Lacombe 
Signed-off-by: Michal Marek

nconfig: Avoid Wunused-but-set warning

2011-07-13T11:47:09+00:00

I am seeing Wunused-but-set warning while make nconfig.  Looks like
active_menu is not used. Removing it fixes the warning.

Signed-off-by: Raghavendra D Prabhu 
Acked-by: WANG Cong 
Signed-off-by: Michal Marek

Merge branch 'kconfig-trivial' of git://github.com/lacombar/linux-2.6 into kbuild/kconfig

2011-07-04T09:24:10+00:00