30 Jul, 2011
2 commits
-
* '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
-
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
25 Jul, 2011
1 commit
-
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
18 Jul, 2011
1 commit
-
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 ChehabBroken-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
13 Jul, 2011
4 commits
-
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 -
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
boolmenu "FOO"
config BAR
bool "BAR"
depends on DEPendmenu
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 -
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 -
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
04 Jul, 2011
1 commit
02 Jul, 2011
5 commits
-
This function has not much reason to be public. In the mean time, convert
declaration from K&R C to ISO C.Signed-off-by: Arnaud Lacombe
-
Commit 5a6f8d2bd9e3392569ed6f29ea4d7210652f929b removed `kconfig_load()',
however, it missed an hidden prototypes in `lkc.h'. Fix this.Signed-off-by: Arnaud Lacombe
-
Signed-off-by: Arnaud Lacombe
-
This variable is not used outside of main() so there is not much reason keeping
it global. Ensure it is initialized as gcc has no way to know that normal
execution path expect only one option switch to be given on the command line
(except when we request help). As a result, we always initialize
`defconfig_file' before using it.Signed-off-by: Arnaud Lacombe
-
Signed-off-by: Arnaud Lacombe
01 Jul, 2011
1 commit
-
Make conf_write_symbol() grammar agnostic to be able to use it from different
code path. These path pass a printer callback which will print a symbol's name
and its value in different format.conf_write_symbol()'s job become mostly only to prepare a string for the
printer. This avoid to have to pass specialized flag to generic
functionsSigned-off-by: Arnaud Lacombe
[mmarek: rebased on top of de12518 (kconfig: autogenerated config_is_xxx
macro)]
Signed-off-by: Michal Marek
24 Jun, 2011
1 commit
-
Considering the following configuration:
config F
bool "F"choice AB
bool "AB"
config A
bool "A"
config B
bool "B"
endchoiceif A
config D
bool
default y if F
select E
config E
bool "E"
endifif B
config D
bool
default y if F
select E
config E
bool "E"
endifThe following configuration:
CONFIG_F=y
CONFIG_A=y
# CONFIG_B is not set
CONFIG_D=y
CONFIG_E=yemits a spurious warning:
(D) selects E which has unmet direct dependencies (B)
If a symbol appears in two different branch of the tree, it should inherit the
dependency of both parent, not just the last one.Reported-by: Yann E. Morin
Tested-by: Yann E. Morin
Signed-off-by: Arnaud Lacombe
Signed-off-by: Michal Marek
10 Jun, 2011
5 commits
-
Signed-off-by: Arnaud Lacombe
-
Signed-off-by: Arnaud Lacombe
-
This avoids the creation of a top-level `lex.backup' when the lexer gets
re-generated.Signed-off-by: Arnaud Lacombe
-
Signed-off-by: Arnaud Lacombe
-
Signed-off-by: Arnaud Lacombe
09 Jun, 2011
1 commit
07 Jun, 2011
9 commits
-
As the `gconf' frontend is un-maintained, go the easy way by silencing
the "warning: no previous prototype for ''" warnings.Signed-off-by: Arnaud Lacombe
-
The only call site of renderer_toggled() has been commented out since Apr. 2003,
as per Linus' Linux history repository:commit e7f67eb3c0570aa50c1cc0707b478a6d93bdc255
Author: Roman Zippel
Date: Fri Apr 4 04:18:05 2003 -0800[PATCH] gconf update
A gconf update by Romain Livin
- fixed bug when double-clicking for changing value.
- expand row when enabling a row with a submenu.
- various bug fixesAs this result in a warning:
scripts/kconfig/gconf.c:891:13: warning: 'renderer_toggled' defined but not used
just nuke that code.
Signed-off-by: Arnaud Lacombe
-
This interface is not (and has never been ?) used by any frontend, just get rid
of it.Signed-off-by: Arnaud Lacombe
-
SWIG is not used (yet?) to create kconfig binding, so there is no point
referencing it.Signed-off-by: Arnaud Lacombe
-
This header is needed when using {m,re}alloc(3) and free(3) function family.
Signed-off-by: Arnaud Lacombe
-
This header is needed when using isspace(3) function family.
Signed-off-by: Arnaud Lacombe
-
This header is needed when using va_{start,end,copy}(3) functions family.
Signed-off-by: Arnaud Lacombe
-
Cc: Sam Ravnborg
Signed-off-by: Arnaud Lacombe -
Signed-off-by: Arnaud Lacombe
25 May, 2011
3 commits
-
For strings and integers, the config_is_xxx macros are useless and
sometimes misleading:#define CONFIG_INITRAMFS_SOURCE ""
#define config_is_initramfs_source() 1Cc: Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Michal Marek -
Avoid to have multiple path saving the config. This fixes an error check
miss when the window is being closed and the user requested the config
to be written.Reported-by: Hiromu Yakura
Pointed-out-by: Michal Marek
Signed-off-by: Michal Marek
24 May, 2011
4 commits
-
Signed-off-by: Arnaud Lacombe
Signed-off-by: Michal Marek -
When the gconfig program starts in full mode view, it shows the
left treeview which belongs to the 'split mode view'. The patch
fix this visual issue.Signed-off-by: Eduardo Silva
Signed-off-by: Michal Marek -
Due to the large amount of rows in the treeviews, is difficult to
match columns with rows, setting the rules hint to 'true' allows the
treeview to alternate background colors in the rows making the data
more readable.Signed-off-by: Eduardo Silva
Tested-by: Randy Dunlap
Signed-off-by: Michal Marek
17 May, 2011
1 commit
-
this will allow to use to use
if(config_is_xxx())
if(config_is_xxx_module())in the code instead of
#ifdef CONFIG_xxx
#ifdef CONFIG_xxx_MODULEand now let the compiler remove the non usefull code and not the
pre-processoras done in the mach-types for arm as exmaple
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
Acked-by: Andi Kleen
Signed-off-by: Michal Marek
29 Apr, 2011
1 commit
-
Signed-off-by: Peter Foley
Signed-off-by: Michal Marek