aboutsummaryrefslogtreecommitdiff
path: root/scripts/kconfig
AgeCommit message (Collapse)AuthorFilesLines
2011-07-25xconfig: Abort close if configuration cannot be savedMichal Marek2-4/+11
Give the user an opportunity to fix the error or save the configuration under a different path. Reported-by: Hiromu Yakura <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-07-18kconfig: fix missing "0x" prefix from S_HEX symbol in autoconf.hArnaud Lacombe1-5/+21
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 <[email protected]> Cc: Mauro Carvalho Chehab <[email protected]> Broken-by: Arnaud Lacombe <[email protected]> Reported-by: Randy Dunlap <[email protected]> Reported-by: Mauro Carvalho Chehab <[email protected]> Acked-by: Mauro Carvalho Chehab <[email protected]> Acked-by: Randy Dunlap <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-07-13kconfig/nconf: remove useless conditionnalArnaud Lacombe1-4/+1
After the test if (!submenu || ...) continue; the variable `submenu' can _not_ be NULL, so do not test for this situation. Cc: Nir Tzachar <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-07-13kconfig/nconf: prevent segfault on empty menuArnaud Lacombe1-1/+6
nconf does not check the validity of the current menu when help is requested (with either <F2>, '?' 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 <[email protected]> Cc: Andrej Gelenberg <[email protected]> Reported-by: Andrej Gelenberg <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-07-13kconfig/nconf: use the generic menu_get_ext_help()Arnaud Lacombe1-13/+1
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 <[email protected]> Cc: Andrej Gelenberg <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-07-13nconfig: Avoid Wunused-but-set warningRaghavendra D Prabhu1-2/+0
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 <[email protected]> Acked-by: WANG Cong <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-07-04Merge branch 'kconfig-trivial' of git://github.com/lacombar/linux-2.6 into ↵Michal Marek3-22/+39
kbuild/kconfig
2011-07-02kconfig/conf: mark xfgets() privateArnaud Lacombe2-7/+3
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 <[email protected]>
2011-07-02kconfig: remove pending prototypes for kconfig_load()Arnaud Lacombe1-3/+0
Commit 5a6f8d2bd9e3392569ed6f29ea4d7210652f929b removed `kconfig_load()', however, it missed an hidden prototypes in `lkc.h'. Fix this. Signed-off-by: Arnaud Lacombe <[email protected]>
2011-07-02kconfig/conf: add command line options' descriptionArnaud Lacombe1-1/+31
Signed-off-by: Arnaud Lacombe <[email protected]>
2011-07-02kconfig/conf: reduce the scope of `defconfig_file'Arnaud Lacombe1-3/+1
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 <[email protected]>
2011-07-02kconfig: use calloc() for expr allocationArnaud Lacombe1-8/+4
Signed-off-by: Arnaud Lacombe <[email protected]>
2011-07-01kconfig: introduce specialized printerArnaud Lacombe4-128/+266
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 functions Signed-off-by: Arnaud Lacombe <[email protected]> [mmarek: rebased on top of de12518 (kconfig: autogenerated config_is_xxx macro)] Signed-off-by: Michal Marek <[email protected]>
2011-06-24kconfig: do not overwrite symbol direct dependency in assignmentArnaud Lacombe1-1/+1
Considering the following configuration: config F bool "F" choice AB bool "AB" config A bool "A" config B bool "B" endchoice if A config D bool default y if F select E config E bool "E" endif if B config D bool default y if F select E config E bool "E" endif The following configuration: CONFIG_F=y CONFIG_A=y # CONFIG_B is not set CONFIG_D=y CONFIG_E=y emits 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 <[email protected]> Tested-by: Yann E. Morin <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-06-09kconfig: regen parserArnaud Lacombe4-173/+200
Signed-off-by: Arnaud Lacombe <[email protected]>
2011-06-09kconfig: migrate parser to implicit rulesArnaud Lacombe3-27/+5
Signed-off-by: Arnaud Lacombe <[email protected]>
2011-06-09kconfig/zconf.l: do not ask to generate backupArnaud Lacombe1-2/+2
This avoids the creation of a top-level `lex.backup' when the lexer gets re-generated. Signed-off-by: Arnaud Lacombe <[email protected]>
2011-06-09kconfig: kill no longer needed reference to YYDEBUGArnaud Lacombe2-10/+0
Signed-off-by: Arnaud Lacombe <[email protected]>
2011-06-09kconfig: constify `kconf_id_lookup'Arnaud Lacombe4-8/+8
Signed-off-by: Arnaud Lacombe <[email protected]>
2011-06-08Merge branch 'kconfig-trivial' of git://github.com/lacombar/linux-2.6 into ↵Michal Marek19-112/+26
kbuild/kconfig
2011-06-06kconfig/gconf: silent missing prototype warningsArnaud Lacombe1-1/+2
As the `gconf' frontend is un-maintained, go the easy way by silencing the "warning: no previous prototype for '<fn>'" warnings. Signed-off-by: Arnaud Lacombe <[email protected]>
2011-06-06kconfig/gconf: kill deadcodeArnaud Lacombe1-33/+0
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 <[email protected]> Date: Fri Apr 4 04:18:05 2003 -0800 [PATCH] gconf update A gconf update by Romain Li<C3><A9>vin <[email protected]> - fixed bug when double-clicking for changing value. - expand row when enabling a row with a submenu. - various bug fixes As 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 <[email protected]>
2011-06-06kconfig: nuke LKC_DIRECT_LINK cruftArnaud Lacombe17-76/+9
This interface is not (and has never been ?) used by any frontend, just get rid of it. Signed-off-by: Arnaud Lacombe <[email protected]>
2011-06-06kconfig: nuke reference to SWIGArnaud Lacombe1-3/+0
SWIG is not used (yet?) to create kconfig binding, so there is no point referencing it. Signed-off-by: Arnaud Lacombe <[email protected]>
2011-06-06kconfig: add missing <stdlib.h> inclusionArnaud Lacombe1-0/+1
This header is needed when using {m,re}alloc(3) and free(3) function family. Signed-off-by: Arnaud Lacombe <[email protected]>
2011-06-06kconfig: add missing <ctype.h> inclusionArnaud Lacombe1-0/+1
This header is needed when using isspace(3) function family. Signed-off-by: Arnaud Lacombe <[email protected]>
2011-06-06kconfig: add missing <stdarg.h> inclusionArnaud Lacombe3-0/+3
This header is needed when using va_{start,end,copy}(3) functions family. Signed-off-by: Arnaud Lacombe <[email protected]>
2011-06-06kconfig: fix return code for invalid boolean symbol in conf_set_sym_val()Arnaud Lacombe1-1/+1
Cc: Sam Ravnborg <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]>
2011-06-06kconfig: annotate non-trivial fall-troughArnaud Lacombe4-0/+11
Signed-off-by: Arnaud Lacombe <[email protected]>
2011-05-25Merge branch 'kbuild/kconfig-for-40' into kbuild/kconfigMichal Marek1-3/+2
2011-05-25kconfig: Only generate config_is_xxx for bool and tristate optionsMichal Marek1-5/+3
For strings and integers, the config_is_xxx macros are useless and sometimes misleading: #define CONFIG_INITRAMFS_SOURCE "" #define config_is_initramfs_source() 1 Cc: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-05-25xconfig: merge code path to conf_write()Arnaud Lacombe1-3/+2
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 <[email protected]> Pointed-out-by: Michal Marek <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-05-24Merge branch 'kbuild/kconfig-for-40' into kbuild/kconfigMichal Marek2-15/+9
2011-05-24kconfig: do not record timestamp in .configArnaud Lacombe1-11/+1
Signed-off-by: Arnaud Lacombe <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-05-24gconfig: Hide unused left treeview when start up the interfaceEduardo Silva1-2/+6
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 <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-05-24gconfig: enable rules hint for main treeviewsEduardo Silva1-2/+2
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 <[email protected]> Tested-by: Randy Dunlap <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-05-17kconfig: autogenerated config_is_xxx macroJean-Christophe PLAGNIOL-VILLARD1-0/+29
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_MODULE and now let the compiler remove the non usefull code and not the pre-processor as done in the mach-types for arm as exmaple Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Acked-by: Andi Kleen <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-04-29kconfig: quiet commands when V=0Peter Foley1-2/+2
Signed-off-by: Peter Foley <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-04-29kconfig: change update-po-config to reflect new layout of arch/umPeter Foley1-2/+2
Signed-off-by: Peter Foley <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-04-29kconfig: make update-po-config work in KBUILD_OUTPUTPeter Foley1-7/+9
Signed-off-by: Peter Foley <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-04-29kconfig: rearrange clean-filesPeter Foley1-2/+2
Signed-off-by: Peter Foley <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-04-29kconfig: change gconf to modify hostprogs-y like nconf and mconfPeter Foley1-2/+3
Signed-off-by: Peter Foley <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-04-29kconfig: change qconf to modify hostprogs-y like nconf and mconfPeter Foley1-3/+4
Signed-off-by: Peter Foley <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-04-29kconfig: only build kxgettext when neededPeter Foley1-1/+5
Signed-off-by: Peter Foley <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-04-19nconfig: Silence unused return values from wattrsetStephen Boyd1-7/+7
Ignore the return value from wattrset since we ignore the return value in nconf.gui.c as well. scripts/kconfig/nconf.c: In function 'print_function_line': scripts/kconfig/nconf.c:376: warning: value computed is not used scripts/kconfig/nconf.c:380: warning: value computed is not used scripts/kconfig/nconf.c:387: warning: value computed is not used scripts/kconfig/nconf.c: In function 'show_menu': scripts/kconfig/nconf.c:956: warning: value computed is not used scripts/kconfig/nconf.c:961: warning: value computed is not used scripts/kconfig/nconf.c:963: warning: value computed is not used scripts/kconfig/nconf.c:965: warning: value computed is not used Cc: Nir Tzachar <[email protected]> Signed-off-by: Stephen Boyd <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-04-18kconfig: Do not record timestamp in auto.conf and autoconf.hMichal Marek1-6/+2
Timestamps in file data are useless and there is already one in .config Signed-off-by: Michal Marek <[email protected]>
2011-04-15kconfig: get rid of unused flagsYann E. MORIN3-12/+0
Now that we detect recusrion of sourced files, get rid of now unused flags. Regenerate lex.zconf.c_shipped file. Signed-off-by: "Yann E. MORIN" <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-04-15kconfig: allow multiple inclusion of the same fileYann E. MORIN2-20/+38
Allow 'source'ing the same file from multiple places (eg. from different files, and/or under different conditions). To avoid circular inclusion, scan the source-ancestry of the current file, and abort if already sourced in this branch. Regenerate the pre-parsed lex.zconf.c_shipped file. Signed-off-by: "Yann E. MORIN" <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-04-08kconfig: Avoid buffer underrun in choice inputBen Hutchings1-1/+1
commit 40aee729b350672c2550640622416a855e27938f ('kconfig: fix default value for choice input') fixed some cases where kconfig would select the wrong option from a choice with a single valid option and thus enter an infinite loop. However, this broke the test for user input of the form 'N?', because when kconfig selects the single valid option the input is zero-length and the test will read the byte before the input buffer. If this happens to contain '?' (as it will in a mips build on Debian unstable today) then kconfig again enters an infinite loop. Signed-off-by: Ben Hutchings <[email protected]> Cc: [email protected] [2.6.17+] Signed-off-by: Michal Marek <[email protected]>
2011-02-08trivial: Fix Steven's Copyright typosUwe Kleine-König1-1/+1
OK, the copyright allows you to write a copy, still I think the lawyers prefer the correct spelling. Signed-off-by: Uwe Kleine-König <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Steven Rostedt <[email protected]>