24 Apr, 2011

1 commit

  • Commit 40aee729b350 ('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
    Cc: stable@kernel.org [2.6.17+]
    Signed-off-by: Linus Torvalds

    Ben Hutchings
     

09 Feb, 2011

1 commit


11 Jan, 2011

1 commit

  • * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
    nconf: handle comment entries within choice/endchoice
    kconfig: fix warning
    kconfig: Make expr_copy() take a const argument
    kconfig: simplify select-with-unmet-direct-dependency warning
    kconfig: add more S_INT and S_HEX consistency checks
    kconfig: fix `zconfdebug' extern declaration
    kconfig/conf: merge duplicate switch's case
    kconfig: fix typos
    kbuild/gconf: add dummy inline for bind_textdomain_codeset()
    kbuild/nconf: fix spaces damage
    kconfig: nuke second argument of conf_write_symbol()
    kconfig: do not define AUTOCONF_INCLUDED
    kconfig: the day kconfig warns about "select"-abuse has come

    Linus Torvalds
     

07 Jan, 2011

1 commit

  • Equivalent to af6c1598 (kconfig: handle comment entries within
    choice/endchoice), but for nconfig instead.

    Implement support for comment entries within choice groups. Comment entries
    are displayed visually distinct from normal configs, and selecting them is
    a no-op.

    Signed-off-by: Peter Korsgaard
    Signed-off-by: Michal Marek

    Peter Korsgaard
     

30 Dec, 2010

1 commit

  • This lead to non-selected, non-user-selectable options to be written
    out to .config. This is not only pointless, but also preventing the
    user to be prompted should any of those options eventually become
    visible (e.g. by de-selecting the *_AUTO options the "visible"
    attribute was added for.

    Furthermore it is quite logical for the "visible" attribute of a menu
    to control the visibility of all contained prompts, which is what the
    patch does.

    Signed-off-by: Jan Beulich
    Signed-off-by: Michal Marek

    Jan Beulich
     

28 Dec, 2010

1 commit

  • In file included from scripts/kconfig/zconf.tab.c:2502:
    scripts/kconfig/expr.c:1033: warning: no previous prototype for 'expr_simplify_unmet_dep'

    Reported-by: Stephen Rothwell
    Signed-off-by: Arnaud Lacombe
    Signed-off-by: Michal Marek

    Arnaud Lacombe
     

22 Dec, 2010

2 commits

  • Fixes
    scripts/kconfig/expr.c: In function ‘expr_get_leftmost_symbol’:
    scripts/kconfig/expr.c:1026:2: warning: passing argument 1 of ‘expr_copy’ discards qualifiers from pointer target type
    scripts/kconfig/expr.c:67:14: note: expected ‘struct expr *’ but argument is of type ‘const struct expr *’

    Signed-off-by: Michal Marek

    Michal Marek
     
  • This is an attempt to simplify the expressing printed by kconfig when a
    symbol is selected but still has direct unmet dependency.

    First, the symbol reverse dependency is split in sub-expression. Then,
    each sub-expression is checked to ensure that it does not contains the
    unmet dependency. This removes the false-positive symbols and fixed symbol
    which already have the correct dependency. Finally, only the symbol
    responsible of the "select" is printed, instead of its full dependency tree.

    CC: Catalin Marinas
    Signed-off-by: Arnaud Lacombe
    Signed-off-by: Michal Marek

    Arnaud Lacombe
     

16 Dec, 2010

1 commit


15 Dec, 2010

7 commits


22 Nov, 2010

2 commits


02 Nov, 2010

1 commit


29 Oct, 2010

5 commits

  • Some menuconfigs in the Kconfig files have prompts and dependencies.
    Currently, streamline_config misses these, and this can cause
    streamline_config to keep modules enabled that should not be, and
    even worse, not enable those that should.

    This patch makes streamline_config process menuconfigs just like it
    would process a config.

    Reported-by: member graysky
    Signed-off-by: Steven Rostedt

    Steven Rostedt
     
  • I noticed that some Kconfig files have multi line dependencies
    that continue with a backslash. Those dependencies on the next
    line will be missed by streamline_config.

    For example:

    config CS89x0
    tristate "CS89x0 support"
    depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \
    || ARCH_IXDP2X01 || MACH_MX31ADS)

    The "|| ARCH_IXDP2X01 || MACH_MX31ADS)" will not be processed.

    This patch adds code to handle this case.

    Signed-off-by: Steven Rostedt

    Steven Rostedt
     
  • On Fri, Aug 17, 2010 at 01:43PM +0800, Américo Wang wrote:
    > Acked-by: WANG Cong
    >
    > BTW, I think we should add "use strict;" too.

    Then I added "use strict;" to streamline_config.pl, I saw another
    warning.

    > Global symbol "$dir" requires explicit package name at
    scripts/kconfig/streamline_config.pl line 286.
    > Global symbol "$dir" requires explicit package name at
    scripts/kconfig/streamline_config.pl line 287.
    > Global symbol "$dir" requires explicit package name at
    scripts/kconfig/streamline_config.pl line 288.

    Then I added "my $dir;" to line 285.

    Cc: Américo Wang
    Cc: Toralf Foerster
    Cc: KAMEZAWA Hiroyuki
    Cc: YOSHIFUJI Hideaki
    Signed-off-by: Hiromu Yakura
    LKML-Reference:

    [ changed to just add my in front of $dir instead of new line ]

    Signed-off-by: Steven Rostedt

    hiromu
     
  • When I added "use strict;" to streamline_config.pl, I saw the following
    warnings:

    > Global symbol "%prompt" requires explicit package name at
    scripts/kconfig/streamline_config.pl line 183.
    > Global symbol "%prompt" requires explicit package name at
    scripts/kconfig/streamline_config.pl line 368.

    The declaration of %prompt was incorrect, and should have been %prompts.

    Cc: Toralf Foerster
    Cc: KAMEZAWA Hiroyuki
    Cc: YOSHIFUJI Hideaki
    Signed-off-by: Hiromu Yakura
    LKML-Reference:
    Signed-off-by: Steven Rostedt

    hiromu yagura
     
  • The commit 838a2e55e6a4e9e8a10451ed2ef0f7a08dabdb04
    kbuild: migrate all arch to the kconfig mainmenu upgrade

    Broke make localmodconfig. The reason was that it added a
    environment variable to the kconfig source, which the
    streamline_config.pl could not handle.

    This patch changes streamline_config.pl to handle kconfig sources
    using environment variables in their names.

    Cc: Arnaud Lacombe
    Cc: Sam Ravnborg
    Cc: Michal Marek
    Signed-off-by: Steven Rostedt

    Steven Rostedt
     

28 Oct, 2010

1 commit


12 Oct, 2010

2 commits


10 Oct, 2010

2 commits

  • Commit 861b4ea4 broke oldnoconfig when removed the oldnoconfig checks on
    if (input_mode == nonint_oldconfig ||
    input_mode == oldnoconfig) {
    if (input_mode == nonint_oldconfig &&
    sym->name &&
    !sym_is_choice_value(sym)) {
    to avoid oldnoconfig chugging through the else stanza.

    Fix that to restore expected behaviour (which I've confirmed in the
    Fedora kernel build that the configs end up looking the same.)

    Signed-off-by: Kyle McMartin
    Acked-by: Sam Ravnborg
    Signed-off-by: Michal Marek

    Kyle McMartin
     
  • After fixing a use-after-free bug in kconfig, a 'make defconfig' or
    'make allmodconfig' fills the screen with warnings that were not
    detected before. Given that we are close to the release now, disable the
    warnings temporarily and deal with them after 2.6.36.

    Signed-off-by: Michal Marek

    Michal Marek
     

04 Oct, 2010

2 commits


01 Oct, 2010

3 commits

  • Reported-by: Stephen Rothwell
    Signed-off-by: Michal Marek

    Michal Marek
     
  • Commit 2e7a091 made struct file->name a const char*, but forgot to
    constify all users of it.

    Reported-by: Stephen Rothwell
    Signed-off-by: Michal Marek

    Michal Marek
     
  • commit 8baefd30b5b0101aa07aa75da44a9eee881eed28 of linux-next replaced
    a `switch()' statement with some `if()' statements, but left `break's
    in the `switch()' statement untouched. This cause read config loop to
    exit and so "make oldconfig" is not much usable (see below).

    > $ make oldconfig
    >
    > scripts/kconfig/conf --oldconfig Kconfig
    > #
    > # using defaults found in /boot/config-2.6.34-ccs-r1
    > #
    > *
    > * Restart config...
    > *
    > *
    > * General setup
    > *
    > Prompt for development and/or incomplete code/drivers (EXPERIMENTAL) [N/y/?] (NEW)

    (I've already have "CONFIG_EXPERIMENTAL=y" in the old config file. But
    that's not read here.)

    This patch should fix this problem.

    Signed-off-by: Naohiro Aota
    Signed-off-by: Michal Marek

    Naohiro Aota
     

28 Sep, 2010

1 commit

  • …nux-2.6 into kbuild/kconfig

    * 'kbuild/kconfig/kbuild-generic-v7' of http://github.com/lacombar/linux-2.6:
    kbuild: migrate all arch to the kconfig mainmenu upgrade
    kconfig: expand file names
    kconfig: use the file's name of sourced file
    kconfig: constify file name
    kconfig: don't emit warning upon rootmenu's prompt redefinition
    kconfig: replace KERNELVERSION usage by the mainmenu's prompt
    kconfig: delay gconf window initialization
    kconfig: expand by default the rootmenu's prompt
    kconfig: add a symbol string expansion helper
    kconfig: regen parser
    kconfig: implement the `mainmenu' directive
    kconfig: allow PACKAGE to be defined on the compiler's command-line
    kconfig: rephrase help texts/comments not to include the package name
    kconfig: allow build-time definition of the internal config prefix
    kconfig: rephrase help text not to mention the internal prefix
    kconfig: replace a `switch()' statement by a more flexible `if()' statement

    Michal Marek
     

20 Sep, 2010

5 commits