aboutsummaryrefslogtreecommitdiff
path: root/scripts/kconfig
AgeCommit message (Collapse)AuthorFilesLines
2012-07-04kconfig: fix check-lxdialog for DLL platformsYaakov Selkowitz1-1/+1
Import libraries on Cygwin and MinGW/MSYS use the .dll.a suffix, so checking this suffix is necessary to make sure ncurses will still be found when built without static libraries. Signed-off-by: Yaakov Selkowitz <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-07-04kconfig: check ncursesw headers first in check-lxdialogYaakov Selkowitz1-3/+3
Commit 8c41e5e363db55d91aa3b1cdce4ab02ad9821de7 added a check for ncursesw/curses.h for the case where ncurses and ncursesw are build separately but only one is installed. But if both are installed, the headers ncurses/curses.h and ncursesw/curses.h differ, and since libncursesw will be found first, so should ncursesw/curses.h. Signed-off-by: Yaakov Selkowitz <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-07-04kconfig/nconf: fix compile with ncurses reentrant APIYaakov Selkowitz1-0/+4
ESCDELAY is a global variable which is replaced by getter and setter functions with NCURSES_REENTRANT. This fixes the following error: nconf.c: In function ‘main’: nconf.c:1506:2: error: lvalue required as left operand of assignment Signed-off-by: Yaakov Selkowitz <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-06-19localmodconfig: Add debug environment variable LOCALMODCONFIG_DEBUGSteven Rostedt1-0/+21
If the environment variable LOCALMODCONFIG_DEBUG is set, then debug output will appear in the make localmodconfig. This will simplify debugging what people get with their output, as I can just tell people to do: LOCALMODCONFIG_DEBUG=1 make localmodconfig 2>out.txt and have them send me the out.txt. I'll be able to see why things are not working as they think it should be. Signed-off-by: Steven Rostedt <[email protected]>
2012-06-19localmodconfig: Check if configs are already set for selectsSteven Rostedt1-11/+104
There are some cases that a required module does not have a prompt and needs to have another module enabled that selects it to be set. As localmodconfig is conservative and tries to make the minimum config without breaking the user's kernel, or keeping the user from using devices that were loaded when the lsmod was done, all modules that select this module will also be enabled. If you needed module A, but module A did not have a prompt but needed module B to be selected, localmodconfig would make sure B was still enabled. If not only B selected A, but C, D, E, F, and G also selected A, then all of those would also be included, as well as the modules they depend on. This ballooned the number of configs that localmodconfig would keep. The fix here is to process the depends first, and then record those configs that did not have a prompt and needed to be selected. After the depends are done, check what configs are needed to select the configs in the list, and if a config that selects it is already set, then we don't need to do anything else. If no config that selects the config is set, then just pick one and try again. This change brought down the number of selected modules from 290 to 67! Both before and after were run against a config that had 3095 modules enabled. Tested-by: John David Yost <[email protected]> # AlleyTrotter Signed-off-by: Steven Rostedt <[email protected]>
2012-06-19localmodconfig: Read in orig config file to avoid extra processingSteven Rostedt1-2/+24
Read in the entire config file. If there's a config that we depend on that happens to be in the core set (not a module) then we do not need to process it as a module. Currently, we follow the entire depend and selects even if they are enabled as core and not modules. By checking to make sure that we only look at modules we can drop the count a little. From one of my tests, localmodconfig went from taking 3095 set modules down to 356 before this patch, and down to 290 modules after the change. Tested-by: John David Yost <[email protected]> # AlleyTrotter Signed-off-by: Steven Rostedt <[email protected]>
2012-06-19localmodconfig: Comments and cleanup for streamline_config.plSteven Rostedt1-4/+9
Added some more comments and cleaned up part of the the code to use a named variable instead of one of the special $1 perl variables. No functional changes. Signed-off-by: Steven Rostedt <[email protected]>
2012-05-28Merge branch 'kconfig' of ↵Linus Torvalds1-6/+16
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild Pull kconfig changes from Michal Marek: - Error handling for make KCONFIG_ALLCONFIG=<...> all*config plus a fix for a bug that was exposed by this - Fix for the script/config utility. * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: scripts/config: properly report and set string options kbuild: all{no,yes,mod,def,rand}config only read files when instructed to. kconfig: Add error handling to KCONFIG_ALLCONFIG
2012-05-17MCA: delete all remaining traces of microchannel bus support.Paul Gortmaker2-2/+2
Hardware with MCA bus is limited to 386 and 486 class machines that are now 20+ years old and typically with less than 32MB of memory. A quick search on the internet, and you see that even the MCA hobbyist/enthusiast community has lost interest in the early 2000 era and never really even moved ahead from the 2.4 kernels to the 2.6 series. This deletes anything remaining related to CONFIG_MCA from core kernel code and from the x86 architecture. There is no point in carrying this any further into the future. One complication to watch for is inadvertently scooping up stuff relating to machine check, since there is overlap in the TLA name space (e.g. arch/x86/boot/mca.c). Cc: Thomas Gleixner <[email protected]> Cc: James Bottomley <[email protected]> Cc: [email protected] Acked-by: Ingo Molnar <[email protected]> Acked-by: H. Peter Anvin <[email protected]> Signed-off-by: Paul Gortmaker <[email protected]>
2012-05-07kbuild: all{no,yes,mod,def,rand}config only read files when instructed to.Eric W. Biederman1-1/+3
Prevent subtle surprises to both people working on the kconfig code and people using make allnoconfig allyesconfig allmoconfig and randconfig by only attempting to read a config file if KCONFIG_ALLCONFIG is set. Common sense suggests attempting to read the extra config files does not make sense unless requested. The documentation says the code won't attempt to read the extra config files unless requested. Current usage does not appear to include people depending on the code reading the config files without the variable being set So do the simple thing and stop reading config files when passed all{no,yes,mod,def,rand}config unless KCONFIG_ALLCONFIG environment variable is set. Signed-off-by: Eric W. Biederman <[email protected]> Reported-by: Stephen Rothwell <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-05-05kconfig: Add error handling to KCONFIG_ALLCONFIGEric W. Biederman1-6/+14
- Only try to read the file specified if KCONFIG_ALL_CONFIG is set to something other than the empty string or "1". - Don't use stat to check the name passed to conf_read_simple so that zconf_fopen can find the file in the current directory or in SRCTREE removing a extremely source of confusing failure, where KCONFIG_ALL_CONFIG was not interpreted with respect to the directory make was called in. - If conf_read_simple fails complain clearly and stop processing. Allowing the simple debugging of typos. - Clearly document the behavior so it is clear to users which values are treated as flags and which values are treated as filenames. Signed-off-by: Eric W. Biederman <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-04-12kconfig: delete last traces of __enabled_ from autoconf.hPaul Gortmaker1-11/+0
We've now fixed IS_ENABLED() and friends to not require any special "__enabled_" prefixed versions of the normal Kconfig options, so delete the last traces of them being generated. Signed-off-by: Paul Gortmaker <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-04-12Revert "kconfig: fix __enabled_ macros definition for invisible and ↵Paul Gortmaker1-36/+13
un-selected symbols" This reverts commit 953742c8fe8ac45be453fee959d7be40cd89f920. Dumping two lines into autoconf.h for all existing Kconfig options results in a giant file (~16k lines) we have to process each time we compile something. We've weaned IS_ENABLED() and similar off of requiring the __enabled_ definitions so now we can revert the change which caused all the extra lines. Signed-off-by: Paul Gortmaker <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-03-30merge_config.sh: Add option to display redundant configsJohn Stultz1-0/+9
Provide a -r option to display when fragments contain redundant options. This is really useful when breaking apart a config into fragments, as well as cleaning up older fragments. Signed-off-by: John Stultz <[email protected]> Acked-by: Darren Hart <[email protected]> Acked-by: Bruce Ashfield <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-03-30merge_config.sh: Set execute bitJohn Stultz1-0/+0
Somehow the merge_config.sh script didn't get its execute bit set when it was merged. Fix this. Signed-off-by: John Stultz <[email protected]> Acked-by: Darren Hart <[email protected]> Acked-by: Bruce Ashfield <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-03-24merge_config.sh: Use the first file as the initial configJosh Boyer1-1/+5
Take the first config fragment and use it verbatim as the initial config set. This avoids running the verification loop for the first file, as nothing has actually been merged at this point. This significantly increases performance for large config fragments. Signed-off-by: Josh Boyer <[email protected]> Acked-by: John Stultz <[email protected]> Acked-by: Darren Hart <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-01-26kconfig: fix new choices being skipped upon config updateArnaud Lacombe2-21/+14
Running `oldconfig' after any of the following configuration change: either trivial addition, such as: config A bool "A" choice prompt "Choice ?" depends on A config CHOICE_B bool "Choice B" config CHOICE_C bool "Choice C" endchoice or more tricky change: OLD KCONFIG | NEW KCONFIG | | config A | bool "A" | choice | choice prompt "Choice ?" | prompt "Choice ?" | config CHOICE_C | config CHOICE_C bool "Choice C" | bool "Choice C" | config CHOICE_D | config CHOICE_D bool "Choice D" | bool "Choice D" endchoice | | config CHOICE_E | bool "Choice E" | depends on A | endchoice will not cause the choice to be considered as NEW, and thus not be asked. The cause of this behavior is that choice's novelty are computed statically right after the saved configuration has been read. At this point, the new dependency's value is still unknown and asserted to be `no'. Moreover, no update to this decision is made afterward. Correct this by dynamically evaluating a choice's novelty, and removing the static evaluation. Reported-and-tested-by: Uwe Kleine-König <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-01-16Merge branch 'kconfig' of ↵Linus Torvalds7-14/+133
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: menuconfig: fix a regression when canceling the prompt dialog at exit kbuild: Fix compiler warning with assertion when calling 'fwrite' Improve update-po-config output menuconfig: let make not report error when not save configuration merge_config.sh: fix bug in final check merge_config.sh: whitespace cleanup merge_config.sh: use signal names compatible with dash and bash kconfig: add merge_config.sh script kconfig: use xfwrite wrapper function to silence warnings kconfig: fix set but not used warnings kconfig: fix warnings by specifing format arguments
2012-01-16menuconfig: fix a regression when canceling the prompt dialog at exitLi Zefan1-1/+2
This commit fixes a bug, while introducing a new one.. commit 7203ddbd4be9720649e47d756a001e0c7d7f8ae2 Author: Wang YanQing <[email protected]> Date: Thu Jan 12 11:31:32 2012 +0800 menuconfig: let make not report error when not save configuration Pressing ESC should cancel the yes/no dialog and return back to the main menu, but not exit from menuconfig. Signed-off-by: Li Zefan <[email protected]> Acked-by: Wang YanQing <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-01-15kbuild: Fix compiler warning with assertion when calling 'fwrite'Arnaud Lacombe2-2/+5
Reinhard Tartler discovered a corner case of calling xfwrite() where the length of the string is zero. Arnaud Lacombe suggested to use assertion for the corner case, as fwrite(3) is currently used: 1) in comment printers. Empty comment are not allowed. 2) in a callback passed to expr_print(), where the string printed is either NULL OR non-empty. 3) in the lexer, auto-generated, and unused. I feel using assertion is a good solution: 1) It cleanly takes care of the above-mentioned corner case. 2) It can be easily disabled by defining NDEBUG. 3) It asserts xfwrite() is simply a wrapper for fwrite(). Reported-by: Reinhard Tartler <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]> Signed-off-by: Jean Sacren <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-01-15Improve update-po-config outputPeter Foley1-3/+3
Make the V=0 output from update-po-config be aligned correctly. Also remove an outdated comment and add a "GEN" statement. Signed-off-by: Peter Foley <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-01-14menuconfig: let make not report error when not save configurationWang YanQing1-0/+1
I find every time when I choice the 'NO' button at the dialog which let me choice whether to save the configuration before exit menuconfig, it always report the blow: " GEN /mnt/sda7/home/build/test/Makefile HOSTCC scripts/kconfig/mconf.o HOSTLD scripts/kconfig/mconf scripts/kconfig/mconf Kconfig Your configuration changes were NOT saved. make[2]: *** [menuconfig] Error 1 make[1]: *** [menuconfig] Error 2 make: *** [sub-make] Error 2 " This patch repair it. Signed-off-by: Wang YanQing <[email protected]> Acked-by: Davidlohr Bueso <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-01-14merge_config.sh: fix bug in final checkJohn Stultz1-2/+2
Arnaud Lacombe pointed out the final checking that the requested configs were included in the final .config was broken. The example was that if you had a fragment that disabled CONFIG_DECOMPRESS_GZIP applied to a normal defconfig, there would be no final warning that CONFIG_DECOMPRESS_GZIP was acutally set in the final .config. This bug was introduced by me in v3 of the original patch, and the following patch reverts the invalid change. Signed-off-by: John Stultz <[email protected]> Reported-by: Arnaud Lacombe <[email protected]> Cc: Darren Hart <[email protected]> Cc: Michal Marek <[email protected]> Cc: Arnaud Lacombe <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-01-14merge_config.sh: whitespace cleanupDarren Hart1-2/+2
Fix whitespace usage in the clean_up routine. Signed-off-by: Darren Hart <[email protected]> Acked-by: John Stultz <[email protected]> Cc: Michal Marek <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-01-14merge_config.sh: use signal names compatible with dash and bashDarren Hart1-1/+1
The SIGHUP SIGINT and SIGTERM names caused failures when running merge_config.sh with the dash shell. Dropping the "SIG" component makes the script work in both bash and dash. Signed-off-by: Darren Hart <[email protected]> Acked-by: John Stultz <[email protected]> Cc: Michal Marek <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-01-14kconfig: add merge_config.sh scriptjohn stultz1-0/+117
After noticing almost every distro has their own method of managing config fragments, I went looking at some best practices, and wanted to try to consolidate some of the different approaches so this fairly simple infrastructure can be shared (and new distros/build systems don't have to implement yet another config fragment merge script). This script is most influenced by the Windriver tools used in the Yocto Project, reusing some portions found there. This script merges multiple config fragments, warning on any overridden values. It then sets any unspecified values to their default, then finally checks to make sure no specified value was dropped due to unsatisfied dependencies. I'm sure this implementation won't work for everyone, and I expect it will need to evolve to adapt for various use cases. But I think its a reasonable starting point. Cc: Sam Ravnborg <[email protected]> Cc: Greg Thelen <[email protected]> Cc: Reinhard Tartler <[email protected]> Cc: Dmitry Fink <[email protected]> Cc: Darren Hart <[email protected]> Cc: Eric B Munson <[email protected]> Cc: Bruce Ashfield <[email protected]> Cc: Michal Marek <[email protected]> Signed-off-by: John Stultz <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2012-01-13kconfig/streamline-config.pl: Fix parsing Makefile with variablesSteven Rostedt1-0/+29
Thomas Lange reported that when he did a 'make localmodconfig', his config was missing the brcmsmac driver, even though he had the module loaded. Looking into this, I found the file: drivers/net/wireless/brcm80211/brcmsmac/Makefile had the following in the Makefile: MODULEPFX := brcmsmac obj-$(CONFIG_BRCMSMAC) += $(MODULEPFX).o The way streamline-config.pl works, is parsing all the obj-$(CONFIG_FOO) += foo.o lines to find that CONFIG_FOO belongs to the module foo.ko. But in this case, the brcmsmac.o was not used, but a variable in its place. By changing streamline-config.pl to remember defined variables in Makefiles and substituting them when they are used in the obj-X lines, allows Thomas (and others) to have their brcmsmac module stay configured when it is loaded and running "make localmodconfig". Reported-by: Thomas Lange <[email protected]> Tested-by: Thomas Lange <[email protected]> Cc: Arend van Spriel <[email protected]> Cc: [email protected] Signed-off-by: Steven Rostedt <[email protected]>
2012-01-13kconfig/streamline-config.pl: Simplify backslash line concatinationSteven Rostedt1-13/+12
Simplify the way lines ending with backslashes (continuation) in Makefiles is parsed. This is needed to implement a necessary fix. Tested-by: Thomas Lange <[email protected]> Cc: [email protected] Signed-off-by: Steven Rostedt <[email protected]>
2011-12-18kconfig: adapt update-po-config to new UML layoutPaul Bolle1-3/+2
Commit 5c48b108 ("um: take arch/um/sys-x86 to arch/x86/um") broke the make target update-po-config, as its symlink trick (again) fails. (Previous breakage was fixed with commit bdc69ca4 ("kconfig: change update-po-config to reflect new layout of arch/um").) The new UML layout allows to drop the symlick trick entirely. And if, one day, another architecture supports UML too, that should now work without again breaking this make target. Signed-off-by: Paul Bolle <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-12-18kconfig: use xfwrite wrapper function to silence warningsPeter Foley1-2/+2
Use the xfwrite wrapper function defined in lkc.h to check the return value of fwrite and silence these warnings. HOSTCC scripts/kconfig/zconf.tab.o scripts/kconfig/zconf.tab.c: In function 'header_print_comment': /usr/src/lto/scripts/kconfig/confdata.c:551:10: warning: ignoring return value of 'fwrite', declared with attribute warn_unused_result scripts/kconfig/zconf.tab.c: In function 'kconfig_print_comment': /usr/src/lto/scripts/kconfig/confdata.c:467:10: warning: ignoring return value of 'fwrite', declared with attribute warn_unused_result Signed-off-by: Peter Foley <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-12-11kconfig: fix set but not used warningsPeter Foley1-4/+1
Remove set but not used variables to fix warnings. HOSTCC scripts/kconfig/gconf.o /usr/src/lto/scripts/kconfig/gconf.c: In function 'change_sym_value': /usr/src/lto/scripts/kconfig/gconf.c:833:11: warning: variable 'oldval' set but not used [-Wunused-but-set-variable] /usr/src/lto/scripts/kconfig/gconf.c: In function 'update_tree': /usr/src/lto/scripts/kconfig/gconf.c:1281:19: warning: variable 'prop' set but not used [-Wunused-but-set-variable] Signed-off-by: Peter Foley <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-12-11kconfig: fix warnings by specifing format argumentsPeter Foley1-3/+3
Specify format arguments to fix warnings. HOSTCC scripts/kconfig/gconf.o /usr/src/lto/scripts/kconfig/gconf.c: In function 'on_introduction1_activate': /usr/src/lto/scripts/kconfig/gconf.c:686:6: warning: format not a string literal and no format arguments /usr/src/lto/scripts/kconfig/gconf.c: In function 'on_about1_activate': /usr/src/lto/scripts/kconfig/gconf.c:704:6: warning: format not a string literal and no format arguments /usr/src/lto/scripts/kconfig/gconf.c: In function 'on_license1_activate': /usr/src/lto/scripts/kconfig/gconf.c:723:6: warning: format not a string literal and no format arguments Signed-off-by: Peter Foley <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-09-09scripts/kconfig/nconf: add KEY_HOME / KEY_END for dialog_inputboxCheng Renquan1-0/+8
to make it easier to locate begin/end when editing long strings; Signed-off-by: Cheng Renquan <[email protected]> Acked By: Nir Tzachar <[email protected]>
2011-09-09scripts/kconfig/nconf: fix editing long stringsCheng Renquan1-6/+23
The original dialog_inputbox doesn't work with longer than prompt_width strings, here fixed it in this way: 1) add variable cursor_form_win to record cursor of form_win, keep its value always between [0, prompt_width-1]; reuse the original cursor_position as cursor of the string result, use (cursor_position-cursor_form_win) as begin offset to show part of the string in form_win; Signed-off-by: Cheng Renquan <[email protected]> Cc: Arnaud Lacombe <[email protected]> Cc: Nir Tzachar <[email protected]>
2011-09-09scripts/kconfig/nconf: dynamically alloc dialog_input_resultCheng Renquan3-17/+26
To support unlimited length string config items; No check for realloc return value keeps code simple, and to be consistent with other existing unchecked malloc in kconfig. Signed-off-by: Cheng Renquan <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]>
2011-09-09scripts/kconfig/nconf: fix memmove's length argCheng Renquan1-1/+1
In case KEY_BACKSPACE / KEY_DC to delete a char, it memmove only (len-cursor_position+1) bytes; the default case is to insert a char, it should also memmove exactly (len-cursor_position+1) bytes; the original use of (len+1) is wrong and may access following memory that doesn't belong to result, may cause SegFault in theory; case KEY_BACKSPACE: if (cursor_position > 0) { memmove(&result[cursor_position-1], &result[cursor_position], len-cursor_position+1); cursor_position--; } break; case KEY_DC: if (cursor_position >= 0 && cursor_position < len) { memmove(&result[cursor_position], &result[cursor_position+1], len-cursor_position+1); } break; default: if ((isgraph(res) || isspace(res)) && len-2 < result_len) { /* insert the char at the proper position */ memmove(&result[cursor_position+1], &result[cursor_position], len-cursor_position+1); result[cursor_position] = res; cursor_position++; } Signed-off-by: Cheng Renquan <[email protected]> Acked-by: Nir Tzachar <[email protected]>
2011-09-09scripts/kconfig/nconf: fix typo: unknow => unknownCheng Renquan1-1/+1
Signed-off-by: Cheng Renquan <[email protected]> Acked-by: Arnaud Lacombe <[email protected]>
2011-08-31Merge branch 'kconfig/for-next' of git://github.com/lacombar/linux-2.6 into ↵Michal Marek3-49/+89
kbuild/kconfig
2011-08-29kconfig: fix set but not used variablesLucas De Marchi1-2/+1
Some variables were being set but never used, which was triggering warnings in GCC >= 4.6. Signed-off-by: Lucas De Marchi <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]>
2011-08-29kconfig: handle SIGINT in menuconfigDavidlohr Bueso1-34/+52
I recently got bitten in the ass when pressing Ctrl-C and lost all my current configuration changes. This patch captures SIGINT and allows the user to save any changes. Some code refactoring was made in order to handle the exit behavior. Signed-off-by: Davidlohr Bueso <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]>
2011-08-29kconfig: fix __enabled_ macros definition for invisible and un-selected symbolsArnaud Lacombe1-13/+36
__enabled_<sym-name> are only generated on visible or selected entries, do not reflect the purpose of its introduction. Fix this by always generating these entries for named symbol. Reported-by: Rabin Vincent <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]>
2011-08-19Merge branch 'master/kconfig-localmodconfig' of ↵Michal Marek2-29/+21
git://github.com/lacombar/linux-2.6 into kbuild/kconfig
2011-08-08kconfig: factor code in menu_get_ext_help()Arnaud Lacombe1-6/+4
Cc: Srinivas Kandagatla <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-08-08kbuild: Fix help text not displayed in choice option.Srinivas Kandagatla1-4/+3
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 <[email protected]> Reviewed-by: Stuart Menefy <[email protected]> Reviewed-by: Arnaud Lacombe <[email protected]> Cc: [email protected] Signed-off-by: Michal Marek <[email protected]>
2011-08-08kconfig/nconf: nuke unreferenced `nohelp_text'Arnaud Lacombe1-2/+0
After commit 5416857867c9cc94aba641898c567d9707de30f1, nohelp_text' is no longer referenced, nuke it. Signed-off-by: Arnaud Lacombe <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-08-08kconfig/streamline_config.pl: merge local{mod,yes}configArnaud Lacombe1-17/+1
The two targets `localmodconfig' and `localyesconfig' only differs from the sed(1) ran on the result of `streamline_config.pl' to convert symbols set to `modules' to `yes'. This conversion can be made directly from the perl script, and thus avoid duplicating the command to generate the configuration. Cc: Steven Rostedt <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]>
2011-08-08kconfig/streamline_config.pl: use options to determine operating modeArnaud Lacombe2-3/+15
The options introduced are --localmodconfig (default) and --localyesconfig. They match the Makefile target behavior. Cc: Steven Rostedt <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]>
2011-08-08kconfig/streamline_config.pl: directly access LSMOD from the environmentArnaud Lacombe2-12/+8
Cc: Steven Rostedt <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]>
2011-07-30Merge branch 'kconfig' of ↵Linus Torvalds21-259/+323
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * '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 <stdlib.h> inclusion kconfig: add missing <ctype.h> inclusion ... Fix up conflicts in scripts/kconfig/Makefile
2011-07-29kconfig: Introduce IS_ENABLED(), IS_BUILTIN() and IS_MODULE()Michal Marek1-57/+14
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 <[email protected]> Acked-by: Randy Dunlap <[email protected]> Signed-off-by: Michal Marek <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.