linux.git/scripts/kconfig, branch v3.12.61

localmodconfig: Use Kbuild files too

2015-08-25T14:57:09+00:00

commit c0ddc8c745b7f89c50385fd7aa03c78dc543fa7a upstream.

In kbuild it is allowed to define objects in files named "Makefile"
and "Kbuild".
Currently localmodconfig reads objects only from "Makefile"s and misses
modules like nouveau.

Link: http://lkml.kernel.org/r/1437948415-16290-1-git-send-email-richard@nod.at

Reported-and-tested-by: Leonidas Spyropoulos 
Signed-off-by: Richard Weinberger 
Signed-off-by: Steven Rostedt 
Signed-off-by: Jiri Slaby

kconfig: Fix warning "‘jump’ may be used uninitialized"

2015-02-09T09:19:54+00:00

commit 2d560306096739e2251329ab5c16059311a151b0 upstream.

Warning:
In file included from scripts/kconfig/zconf.tab.c:2537:0:
scripts/kconfig/menu.c: In function ‘get_symbol_str’:
scripts/kconfig/menu.c:590:18: warning: ‘jump’ may be used uninitialized in this function [-Wmaybe-uninitialized]
     jump->offset = strlen(r->s);

Simplifies the test logic because (head && local) means (jump != 0)
and makes GCC happy when checking if the jump pointer was initialized.

Signed-off-by: Peter Kümmel 
Signed-off-by: Michal Marek 
Cc: Sedat Dilek 
Signed-off-by: Jiri Slaby

kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len

2015-02-09T09:17:19+00:00

commit 503c823048e81cc85c0e9d8c297cc70203e335e5 upstream.

The struct gstr has a capacity that may differ from the actual string length.

However, a string manipulation in the function search_conf made the assumption
that it is the same, which led to messing up some search results, especially
when the content of the gstr in use had not yet reached at least 63 chars.

Signed-off-by: Martin Walch 
Acked-by: Wang YanQing 
Acked-by: Benjamin Poirier 
Reviewed-by: "Yann E. MORIN" 
Signed-off-by: "Yann E. MORIN" 
Signed-off-by: Jiri Slaby

kconfig: do not allow more than one symbol to have 'option modules'

2013-09-05T09:10:08+00:00

Previously, it was possible to have more than one symbol with the
'option modules' attached to them, although only the last one would
in fact control tristates.

Since this does not make much sense, only allow at most one symbol to
control tristates.

Note: it is still possible to have more than one symbol that control
tristates, but indirectly:

    config MOD1
        bool "mod1"
        select MODULES
    config MOD2
        bool "mod2"
        select MODULES
    config MODULES
        bool
        option modules

Signed-off-by: "Yann E. MORIN" 
Cc: Sam Ravnborg 
Signed-off-by: Michal Marek

kconfig: regenerate bison parser

2013-09-05T09:10:01+00:00

Regenerate bison parser after changes made in:
    6902dcc: kconfig: do not special-case 'MODULES' symbol

Signed-off-by: "Yann E. MORIN" 
Cc: Sam Ravnborg 
Signed-off-by: Michal Marek

kconfig: do not special-case 'MODULES' symbol

2013-09-05T09:09:17+00:00

Currently, the 'MODULES' symbol is hard-coded to be the default symbol
that enables/disables tristates, if no other symbol was declared with
'option modules'.

While this used to be needed for the Linux kernel, we now have an
explicit 'option modules' attached to the 'MODULES' symbol (since
cset 11097a036), so we no longer need to special-case it in the
kconfig code.

Furthermore, kconfig is extensively used out of the Linux kernel, and
other projects may have another meaning for a symbol named 'MODULES'.

This patch changes the way we enable/disable tristates: if a symbol was
found with 'option modules' attached to it, then that symbol controls
enabling tristates. Otherwise, tristates are disabled, even if a symbol
named 'MODULES' exists.

Signed-off-by: "Yann E. MORIN" 
Cc: Sam Ravnborg 
Signed-off-by: Michal Marek

kconfig: silence warning when parsing auto.conf when a symbol has changed type

2013-08-15T20:48:08+00:00

When a symbol changes type from tristate to bool, and was previously set to
'm', a subsequent silentoldconfig would warn about inconsistency, such as:

    include/config/auto.conf:3014:warning: symbol value 'm' invalid for
    HOTPLUG_PCI_PCIE

Seen by Linus with the merge in aa8032b (sequence to reproduce by Michal):
    git checkout 1fe0135
    make mrproper
    make allmodconfig
    make silentoldconfig
    git checkout aa8032b
    make allmodconfig
    make silentoldconfig

Since HOTPLUG_PCI_PCIE changed from tristate to bool in aa8032b, it was
previously set to 'm' in auto.conf by the first allmodconfig+silentoldconfig,
but then was set to 'y' by the second allmodconfig. Then the second
silentoldconfig prints the warning.

The warning in this case is a spurious warning, which happens at the time
kconfig tries to detect symbols that have changed, to touch the empty
header files in include/config used for dependency-tracking by make.

Silence the warning when we read the old auto.conf file, since it is
perfectly legit that a symbol changed type since the previous call.

Thread in:
    http://marc.info/?l=linux-pci&m=137569198904000&w=2

Reported-by: Linus Torvalds 
Signed-off-by: "Yann E. MORIN" 
Cc: Linus Torvalds 
Cc: Michal Marek 
Cc: Thomas Petazzoni 
Cc: Bjorn Helgaas 
Cc: Yinghai Lu 
Cc: Benjamin Herrenschmidt

kconfig: switch to "long long" for sanity

2013-08-15T20:48:06+00:00

Instead of using "long" for kconfig "hex" and "range" values, which may
change in size depending on the host architecture, use "long long". This
will allow values greater than INT_MAX on 32-bit hosts when cross
compiling.

Signed-off-by: Kees Cook 
Acked-by: Geert Uytterhoeven 
Tested-by: "Yann E. MORIN" 
Signed-off-by: "Yann E. MORIN"

Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/kconfig

2013-07-23T13:57:17+00:00

kconfig: simplify symbol-search code

2013-07-16T18:39:42+00:00

There is no need for a double indirection in the temporary array that
stores the internediate search results.

Reported-by: Jean Delvare 
Signed-off-by: "Yann E. MORIN" 
Reviewed-by: Jean Delvare