2014-07-30 05:08:13 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
|
|
|
|
* Released under the terms of the GNU GPL v2.0.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
|
|
|
#include "lkc.h"
|
|
|
|
|
2020-03-27 15:46:27 +00:00
|
|
|
/* return true if 'path' exists, false otherwise */
|
|
|
|
static bool is_present(const char *path)
|
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
return !stat(path, &st);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* return true if 'path' exists and it is a directory, false otherwise */
|
|
|
|
static bool is_dir(const char *path)
|
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
if (stat(path, &st))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return S_ISDIR(st.st_mode);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Create the parent directory of the given path.
|
|
|
|
*
|
|
|
|
* For example, if 'include/config/auto.conf' is given, create 'include/config'.
|
|
|
|
*/
|
|
|
|
static int make_parent_dir(const char *path)
|
|
|
|
{
|
|
|
|
char tmp[PATH_MAX + 1];
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
strncpy(tmp, path, sizeof(tmp));
|
|
|
|
tmp[sizeof(tmp) - 1] = 0;
|
|
|
|
|
|
|
|
/* Remove the base name. Just return if nothing is left */
|
|
|
|
p = strrchr(tmp, '/');
|
|
|
|
if (!p)
|
|
|
|
return 0;
|
|
|
|
*(p + 1) = 0;
|
|
|
|
|
|
|
|
/* Just in case it is an absolute path */
|
|
|
|
p = tmp;
|
|
|
|
while (*p == '/')
|
|
|
|
p++;
|
|
|
|
|
|
|
|
while ((p = strchr(p, '/'))) {
|
|
|
|
*p = 0;
|
|
|
|
|
|
|
|
/* skip if the directory exists */
|
|
|
|
if (!is_dir(tmp) && mkdir(tmp, 0755))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
*p = '/';
|
|
|
|
while (*p == '/')
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-07-04 16:56:54 +00:00
|
|
|
struct conf_printer {
|
|
|
|
void (*print_symbol)(FILE *, struct symbol *, const char *, void *);
|
|
|
|
void (*print_comment)(FILE *, const char *, void *);
|
|
|
|
};
|
|
|
|
|
2014-07-30 05:08:13 +00:00
|
|
|
static void conf_warning(const char *fmt, ...)
|
|
|
|
__attribute__ ((format (printf, 1, 2)));
|
|
|
|
|
|
|
|
static void conf_message(const char *fmt, ...)
|
|
|
|
__attribute__ ((format (printf, 1, 2)));
|
|
|
|
|
|
|
|
static const char *conf_filename;
|
kconfig: re-sync with Linux 4.17-rc4
Align Kconfig to Linux 4.17-rc4 with minimal impact on non-kconfig files.
Previous Kconfig sync was done by commit bf7ab1e70fd762 ("kconfig:
re-sync with Linux 4.10") and it achieved almost perfect alignment with
a few (intended) exceptions, caused by below U-boot commits:
[A] v2015.04 5f9eb2207500 ("kbuild: remove scripts/multiconfig.sh")
[B] v2015.07 20c20826efab ("Kconfig: Enable usage of escape char '\' in string values")
[C] v2016.01 da58dec86616 ("Various Makefiles: Add SPDX-License-Identifier tags")
[D] v2016.03 5b8031ccb4ed ("Add more SPDX-License-Identifier tags")
[E] v2016.03 192bc6948b02 ("Fix GCC format-security errors and convert sprintfs.")
Here is the list of Kconfig commits which followed the v4.10 alignment:
[F] v2018.01 0931ed3c0d0f ("kconfig/symbol.c: use correct pointer type argument for sizeof")
[G] v2018.03 1414e09b4f25 ("kconfig: revert change that was not needed for -Wformat-security")
[H] v2018.05 83d290c56fab ("SPDX: Convert all of our single license tags to Linux Kernel style")
Commit [F] was subsequently applied to Linux kernel as commit [I]
with the same patch id, so it won't contribute to further misalignment.
[I] v4.15-rc1 88127dae6ed9 ("kconfig/symbol.c: use correct pointer type argument for sizeof")
Commit [G] is a Kconfig-specific revert of commit [E].
Commit [H] relocated and reformatted the license doing no functional change.
In summary, the only functional change that makes U-boot Kconfig
diverge from Linux Kconfig is commit [B]. After a brief analysis,
the purpose of [B] seems to be placing "\n" literals in string symbols
like CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n" in order to pass
them directly to printf and expect correct output at runtime. Currently,
Linux doesn't seem to have this requirement, so for the moment [B] looks
like a U-boot specific feature/fix. From point of view of further Kconfig
alignment and backporting efforts, it is highly desired that commits
like [B] are propagated to Linux and any Kconfig fixes/features are
contributed to Linux kernel first. This specific Kconfig re-sync just
keeps [B] in place.
Contrary to 4.10 Kconfig re-sync (which achieves zero non-kconfig
changes), 4.17-rc4 re-sync does some amount of updates in Kbuild
(striving to keep them at minimum), due to a number of reasons:
* Kbuild is affected by the removal of Kconfig "*shipped" files and now
requires flex and bison pre-installed on the host.
* PYTHON{2,3} variables are defined in top-level Makefile as
prerequisite for running the newly developed Kconfig unit tests.
* silentoldconfig becomes an "internal implementation detail" deprecated
for external use, being renamed to syncconfig.
The exact non-kconfig files touched by this commit are:
$ git show --format="" --stat -- ':!scripts/kconfig'
.gitignore | 2 ++
Makefile | 9 +++++++--
scripts/Makefile.build | 11 +++++++++++
scripts/Makefile.lib | 41 ++++++++++++-----------------------------
The imported Linux commits touching the above files are:
c054be10ffdbd5 ("remove gperf left-overs from build system")
73a4f6dbe70a1b ("kbuild: add LEX and YACC variables")
033dba2ec06c47 ("kbuild: prepare to remove C files pre-generated by flex and bison")
eea199b445f64c ("kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX")
e71de5ee08dcb0 ("kbuild: remove remaining use of undefined YACC_PREFIX")
d59fbbd09d5d6b ("kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)")
911a91c39cabcb H ("kconfig: rename silentoldconfig to syncconfig")
59889300274569 (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore")
9a8dfb394c0467 ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile")
833e622459432e H ("genksyms: generate lexer and parser during build instead of shipping")
b23d1a241f4eb4 H ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically")
e9781b52d4e0e3 H ("kbuild: add PYTHON2 and PYTHON3 variables")
The commits marked with 'H' are assessed as "hard" (build will fail)
prerequisites and the rest of them are assessed as "soft" prerequisites
for the re-sync. In spite of relatively high number of non-H commits,
they belong to this Kconfig update topic-wise and decrease the number of
cherry pick conflicts for many commits in this series. Additional effort
can be put in eliminating the soft prerequisites, if really needed.
The commits which contributed to this Kconfig re-sync are listed below.
Whenever a conflict resolution has been performed (mostly by hand, but
sometimes automatically by git), it is revealed by the '!' sign in the
second column, which means a patch id mismatch between Linux and U-boot
commits:
9be3213b14d44f ("gconfig: remove misleading parentheses around a condition")
ff85a1a80e0034 ("kconfig: Check for libncurses before menuconfig")
ad8181060788c8 ("kconfig: fix sparse warnings in nconfig")
cb77f0d623ff33 ! ("scripts: Switch to more portable Perl shebang")
bb3290d91695bb ! ("Remove gperf usage from toolchain")
c054be10ffdbd5 ("remove gperf left-overs from build system")
b24413180f5600 ! ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license")
9059a3493efea6 ! ("kconfig: fix relational operators for bool and tristate symbols")
2c37e08464a850 ("kconfig: Warn if choice default is not in choice")
33ca1a24866373 ("kconfig: Document the 'menu' struct")
52aede4ba5efd1 ("kconfig: Document the 'symbol' struct")
c873443430ebd1 ("kconfig: Sync zconf.y with zconf.tab.c_shipped")
9a826842ff2fbd ("kconfig: Rename menu_check_dep() to rewrite_m()")
fa8cedaef814ce ("kconfig: Clarify expression rewriting")
f77850d3fe0c96 ("kconfig: Clean up modules handling and fix crash")
e3b03bf29d6b99 ("kconfig: display recursive dependency resolution hint just once")
73a4f6dbe70a1b ! ("kbuild: add LEX and YACC variables")
033dba2ec06c47 ! ("kbuild: prepare to remove C files pre-generated by flex and bison")
29c833061c1d8c ("kconfig: generate lexer and parser during build instead of shipping")
26e47a3c11a25c ("kconfig: Don't leak symbol names during parsing")
24161a6711c945 ("kconfig: Don't leak 'source' filenames during parsing")
bc28fe1d5ede88 ("kconfig: Don't leak 'option' arguments during parsing")
0724a7c32a54e3 ("kconfig: Don't leak main menus during parsing")
ae7440ef0c8013 ("kconfig: Fix automatic menu creation mem leak")
5b1374b3b3c2fc ("kconfig: Fix expr_free() E_NOT leak")
7cf33f88e29410 ("kconfig: Fix choice symbol expression leak")
05cccce580456d ("kconfig: Document automatic submenu creation code")
0735f7e5def2ab ("kconfig: Document important expression functions")
df60f4b92d3d0b ("kconfig: Remove menu_end_entry()")
b92d804a51796b ("kconfig: drop 'boolean' keyword")
6479f327dea60d ("kconfig: Warn if there is more than one help text")
52e58a3caeba5d ("kconfig: make input_mode static")
5a3dc717b3c785 ("kconfig: make xfgets() really static")
84dd95d4f87a0d ("kconfig: make conf_unsaved a local variable of conf_read()")
765f4cdef6f80d ("kconfig: use default 'yy' prefix for lexer and parser")
eea199b445f64c ("kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX")
e71de5ee08dcb0 ("kbuild: remove remaining use of undefined YACC_PREFIX")
d59fbbd09d5d6b ! ("kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)")
3e41ba05b6d60c ("kconfig: Document SYMBOL_OPTIONAL logic")
d3465af60f4471 ("kconfig: Clarify choice dependency propagation")
9d1a9e8bc18bea ("kconfig: Document 'if' flattening logic")
b53688014e3325 ("kconfig: Clarify menu and 'if' dependency propagation")
d0fd0428ecf04b ("kconfig: fix make xconfig when gettext is missing")
312ee68752faaa ("kconfig: announce removal of oldnoconfig if used")
1ccb27143360bd ("kconfig: make "Selected by:" and "Implied by:" readable")
cedd55d49dee94 ! ("kconfig: Remove silentoldconfig from help and docs; fix kconfig/conf's help")
1b9eda2e4892cb ("kconfig: Warn if help text is blank")
cb67ab2cd2b8ab ("kconfig: do not write choice values when their dependency becomes n")
4f208f392103e8 ("kconfig: show '?' prompt even if no help text is available")
cd58a91def2acc ("kconfig: remove 'config*' pattern from .gitignnore")
d2a04648a5dbc3 ("kconfig: remove check_stdin()")
f3ff6fb5db68bc ("kconfig: echo stdin to stdout if either is redirected")
9e3e10c725360b ("kconfig: send error messages to stderr")
d717f24d8c6808 ("kconfig: add xrealloc() helper")
523ca58b7db2e3 ("kconfig: remove const qualifier from sym_expand_string_value()")
cd81fc82b93fa4 ("kconfig: add xstrdup() helper")
f4bc1eefc1608e ("kconfig: set SYMBOL_AUTO to the symbol marked with defconfig_list")
bf0bbdcf100322 ("kconfig: Don't leak choice names during parsing")
1a90ce36c6eff6 ("kconfig: Update ncurses package names for menuconfig")
5ae6fcc4bb82bd ("kconfig: fix line number in recursive inclusion error message")
07a422bb213adb ! ("kbuild: restore autoksyms.h touch to the top Makefile")
9a47ceec543bfb ("kconfig: clean-up reverse dependency help implementation")
d9119b5925a03b ("kconfig: Print reverse dependencies in groups")
f467c5640c29ad ("kconfig: only write '# CONFIG_FOO is not set' for visible symbols")
59a80b5e892dde ("kconfig: do not call check_conf() for olddefconfig")
4bb3a5b085cd6f ("kconfig: remove unneeded input_mode test in conf()")
99f0b6578bab44 ("kconfig: remove redundant input_mode test for check_conf() loop")
2aad9b89621386 ("kconfig: hide irrelevant sub-menus for oldconfig")
81d2bc2273052e ("kconfig: invoke oldconfig instead of silentoldconfig from local*config")
911a91c39cabcb ! ("kconfig: rename silentoldconfig to syncconfig")
2a61625835c7c8 ! ("kconfig: remove redundant streamline_config.pl prerequisite")
022a4bf6b59dfd ("kconfig: tests: add framework for Kconfig unit testing")
1903c511905984 ("kconfig: tests: add basic choice tests")
49ac3c0c3aa3b7 ("kconfig: tests: test automatic submenu creation")
b76960c0f6b25d ("kconfig: tests: test if new symbols in choice are asked")
930c429a656fdb ("kconfig: tests: check unneeded "is not set" with unmet dependency")
ee236610653ede ("kconfig: tests: check visibility of tristate choice values in y choice")
beaaddb625400e ("kconfig: tests: test defconfig when two choices interact")
3e4888c2e3d77d ("kconfig: tests: test randconfig for choice in choice")
29c434f367ea7b ("kconfig: tests: test if recursive dependencies are detected")
e2c75e7667c737 ("kconfig: tests: test if recursive inclusion is detected")
f622f827958162 ("kconfig: warn unmet direct dependency of tristate symbols selected by y")
f8f69dc0b4e070 ("kconfig: make unmet dependency warnings readable")
26561514cc9def ("kconfig: do not include both curses.h and ncurses.h for nconfig")
32a94b8b0c3e5a ("kconfig: remove duplicated file name and lineno of recursive inclusion")
379a8eb8eb1a55 ("kconfig: detect recursive inclusion earlier")
18492685e479fd ("kconfig: use yylineno option instead of manual lineno increments")
59889300274569 ! (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore")
9a8dfb394c0467 ! ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile")
833e622459432e ! ("genksyms: generate lexer and parser during build instead of shipping")
b23d1a241f4eb4 ! ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically")
17baab68d337a0 ("kconfig: extend output of 'listnewconfig'")
e9781b52d4e0e3 ! ("kbuild: add PYTHON2 and PYTHON3 variables")
The current Kconfig update generates below build-time warnings:
YACC scripts/dtc/dtc-parser.tab.h
scripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
YACC scripts/dtc/dtc-parser.tab.c
scripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
This seems to happen because the Kbuild updates apparently didn't make
room for both "*shipped"-based builds and flex/bison-based builds. A
similar problem has been reported for genksyms parser in v4.17-rc1
commit 833e622459432e ("genksyms: generate lexer and parser during build
instead of shipping"). I have figured out empirically that the warnings
are healed after updating the in-tree U-boot DTC to upstream v1.4.6-9,
same as done by Linux v4.17-rc1 commit 9130ba88464032 ("scripts/dtc:
Update to upstream version v1.4.6-9-gaadd0b65c987"). Whether fixing the
DTC-related yacc warnings should be done together with the Kconfig
re-sync, I would like to hear from community.
My testing was limited to:
- make defconfig all
- make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- r8a7795_ulcb_defconfig all
- comparing .config before and after the re-sync
- running the newly imported Kconfig unit tests as seen below:
$ make testconfig
Tested-by: Petr Vorel <petr.vorel@gmail.com>
============================= test session starts =============================
scripts/kconfig/tests/auto_submenu/__init__.py::test PASSED [ 7%]
scripts/kconfig/tests/choice/__init__.py::test_oldask0 PASSED [ 14%]
scripts/kconfig/tests/choice/__init__.py::test_oldask1 PASSED [ 21%]
scripts/kconfig/tests/choice/__init__.py::test_allyes PASSED [ 28%]
scripts/kconfig/tests/choice/__init__.py::test_allmod PASSED [ 35%]
scripts/kconfig/tests/choice/__init__.py::test_allno PASSED [ 42%]
scripts/kconfig/tests/choice/__init__.py::test_alldef PASSED [ 50%]
scripts/kconfig/tests/choice_value_with_m_dep/__init__.py::test PASSED [ 57%]
scripts/kconfig/tests/err_recursive_inc/__init__.py::test PASSED [ 64%]
scripts/kconfig/tests/inter_choice/__init__.py::test PASSED [ 71%]
scripts/kconfig/tests/new_choice_with_dep/__init__.py::test PASSED [ 78%]
scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py::test PASSED [ 85%]
scripts/kconfig/tests/rand_nested_choice/__init__.py::test PASSED [ 92%]
scripts/kconfig/tests/warn_recursive_dep/__init__.py::test PASSED [100%]
========================== 14 passed in 0.34 seconds ==========================
Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Petr Vorel <petr.vorel@gmail.com>
2018-05-19 12:13:50 +00:00
|
|
|
static int conf_lineno, conf_warnings;
|
2014-07-30 05:08:13 +00:00
|
|
|
|
2020-03-11 22:11:17 +00:00
|
|
|
const char conf_defname[] = "arch/$(ARCH)/defconfig";
|
2014-07-30 05:08:13 +00:00
|
|
|
|
|
|
|
static void conf_warning(const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
va_start(ap, fmt);
|
|
|
|
fprintf(stderr, "%s:%d:warning: ", conf_filename, conf_lineno);
|
|
|
|
vfprintf(stderr, fmt, ap);
|
|
|
|
fprintf(stderr, "\n");
|
|
|
|
va_end(ap);
|
|
|
|
conf_warnings++;
|
|
|
|
}
|
|
|
|
|
2020-03-27 15:46:27 +00:00
|
|
|
static void conf_default_message_callback(const char *s)
|
2014-07-30 05:08:13 +00:00
|
|
|
{
|
|
|
|
printf("#\n# ");
|
2020-03-27 15:46:27 +00:00
|
|
|
printf("%s", s);
|
2014-07-30 05:08:13 +00:00
|
|
|
printf("\n#\n");
|
|
|
|
}
|
|
|
|
|
2020-03-27 15:46:27 +00:00
|
|
|
static void (*conf_message_callback)(const char *s) =
|
2014-07-30 05:08:13 +00:00
|
|
|
conf_default_message_callback;
|
2020-03-27 15:46:27 +00:00
|
|
|
void conf_set_message_callback(void (*fn)(const char *s))
|
2014-07-30 05:08:13 +00:00
|
|
|
{
|
|
|
|
conf_message_callback = fn;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void conf_message(const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
2020-03-27 15:46:27 +00:00
|
|
|
char buf[4096];
|
|
|
|
|
|
|
|
if (!conf_message_callback)
|
|
|
|
return;
|
2014-07-30 05:08:13 +00:00
|
|
|
|
|
|
|
va_start(ap, fmt);
|
2020-03-27 15:46:27 +00:00
|
|
|
|
|
|
|
vsnprintf(buf, sizeof(buf), fmt, ap);
|
|
|
|
conf_message_callback(buf);
|
2015-07-04 16:56:54 +00:00
|
|
|
va_end(ap);
|
2014-07-30 05:08:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
const char *conf_get_configname(void)
|
|
|
|
{
|
|
|
|
char *name = getenv("KCONFIG_CONFIG");
|
|
|
|
|
|
|
|
return name ? name : ".config";
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *conf_get_autoconfig_name(void)
|
|
|
|
{
|
|
|
|
char *name = getenv("KCONFIG_AUTOCONFIG");
|
|
|
|
|
|
|
|
return name ? name : "include/config/auto.conf";
|
|
|
|
}
|
|
|
|
|
|
|
|
char *conf_get_default_confname(void)
|
|
|
|
{
|
|
|
|
static char fullname[PATH_MAX+1];
|
|
|
|
char *env, *name;
|
|
|
|
|
2020-03-11 22:11:17 +00:00
|
|
|
name = expand_string(conf_defname);
|
2014-07-30 05:08:13 +00:00
|
|
|
env = getenv(SRCTREE);
|
|
|
|
if (env) {
|
|
|
|
sprintf(fullname, "%s/%s", env, name);
|
2020-03-27 15:46:27 +00:00
|
|
|
if (is_present(fullname))
|
2014-07-30 05:08:13 +00:00
|
|
|
return fullname;
|
|
|
|
}
|
|
|
|
return name;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
|
|
|
|
{
|
|
|
|
char *p2;
|
|
|
|
|
|
|
|
switch (sym->type) {
|
|
|
|
case S_TRISTATE:
|
|
|
|
if (p[0] == 'm') {
|
|
|
|
sym->def[def].tri = mod;
|
|
|
|
sym->flags |= def_flags;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* fall through */
|
|
|
|
case S_BOOLEAN:
|
|
|
|
if (p[0] == 'y') {
|
|
|
|
sym->def[def].tri = yes;
|
|
|
|
sym->flags |= def_flags;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (p[0] == 'n') {
|
|
|
|
sym->def[def].tri = no;
|
|
|
|
sym->flags |= def_flags;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (def != S_DEF_AUTO)
|
|
|
|
conf_warning("symbol value '%s' invalid for %s",
|
|
|
|
p, sym->name);
|
|
|
|
return 1;
|
|
|
|
case S_OTHER:
|
|
|
|
if (*p != '"') {
|
|
|
|
for (p2 = p; *p2 && !isspace(*p2); p2++)
|
|
|
|
;
|
|
|
|
sym->type = S_STRING;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
/* fall through */
|
|
|
|
case S_STRING:
|
|
|
|
if (*p++ != '"')
|
|
|
|
break;
|
2015-05-29 09:47:32 +00:00
|
|
|
/* Last char has to be a '"' */
|
|
|
|
if (p[strlen(p) - 1] != '"') {
|
2014-07-30 05:08:13 +00:00
|
|
|
if (def != S_DEF_AUTO)
|
|
|
|
conf_warning("invalid string found");
|
|
|
|
return 1;
|
|
|
|
}
|
2015-05-29 09:47:32 +00:00
|
|
|
/* Overwrite '"' with \0 for string termination */
|
|
|
|
p[strlen(p) - 1] = 0;
|
2014-07-30 05:08:13 +00:00
|
|
|
/* fall through */
|
|
|
|
case S_INT:
|
|
|
|
case S_HEX:
|
|
|
|
done:
|
|
|
|
if (sym_string_valid(sym, p)) {
|
kconfig: re-sync with Linux 4.17-rc4
Align Kconfig to Linux 4.17-rc4 with minimal impact on non-kconfig files.
Previous Kconfig sync was done by commit bf7ab1e70fd762 ("kconfig:
re-sync with Linux 4.10") and it achieved almost perfect alignment with
a few (intended) exceptions, caused by below U-boot commits:
[A] v2015.04 5f9eb2207500 ("kbuild: remove scripts/multiconfig.sh")
[B] v2015.07 20c20826efab ("Kconfig: Enable usage of escape char '\' in string values")
[C] v2016.01 da58dec86616 ("Various Makefiles: Add SPDX-License-Identifier tags")
[D] v2016.03 5b8031ccb4ed ("Add more SPDX-License-Identifier tags")
[E] v2016.03 192bc6948b02 ("Fix GCC format-security errors and convert sprintfs.")
Here is the list of Kconfig commits which followed the v4.10 alignment:
[F] v2018.01 0931ed3c0d0f ("kconfig/symbol.c: use correct pointer type argument for sizeof")
[G] v2018.03 1414e09b4f25 ("kconfig: revert change that was not needed for -Wformat-security")
[H] v2018.05 83d290c56fab ("SPDX: Convert all of our single license tags to Linux Kernel style")
Commit [F] was subsequently applied to Linux kernel as commit [I]
with the same patch id, so it won't contribute to further misalignment.
[I] v4.15-rc1 88127dae6ed9 ("kconfig/symbol.c: use correct pointer type argument for sizeof")
Commit [G] is a Kconfig-specific revert of commit [E].
Commit [H] relocated and reformatted the license doing no functional change.
In summary, the only functional change that makes U-boot Kconfig
diverge from Linux Kconfig is commit [B]. After a brief analysis,
the purpose of [B] seems to be placing "\n" literals in string symbols
like CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n" in order to pass
them directly to printf and expect correct output at runtime. Currently,
Linux doesn't seem to have this requirement, so for the moment [B] looks
like a U-boot specific feature/fix. From point of view of further Kconfig
alignment and backporting efforts, it is highly desired that commits
like [B] are propagated to Linux and any Kconfig fixes/features are
contributed to Linux kernel first. This specific Kconfig re-sync just
keeps [B] in place.
Contrary to 4.10 Kconfig re-sync (which achieves zero non-kconfig
changes), 4.17-rc4 re-sync does some amount of updates in Kbuild
(striving to keep them at minimum), due to a number of reasons:
* Kbuild is affected by the removal of Kconfig "*shipped" files and now
requires flex and bison pre-installed on the host.
* PYTHON{2,3} variables are defined in top-level Makefile as
prerequisite for running the newly developed Kconfig unit tests.
* silentoldconfig becomes an "internal implementation detail" deprecated
for external use, being renamed to syncconfig.
The exact non-kconfig files touched by this commit are:
$ git show --format="" --stat -- ':!scripts/kconfig'
.gitignore | 2 ++
Makefile | 9 +++++++--
scripts/Makefile.build | 11 +++++++++++
scripts/Makefile.lib | 41 ++++++++++++-----------------------------
The imported Linux commits touching the above files are:
c054be10ffdbd5 ("remove gperf left-overs from build system")
73a4f6dbe70a1b ("kbuild: add LEX and YACC variables")
033dba2ec06c47 ("kbuild: prepare to remove C files pre-generated by flex and bison")
eea199b445f64c ("kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX")
e71de5ee08dcb0 ("kbuild: remove remaining use of undefined YACC_PREFIX")
d59fbbd09d5d6b ("kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)")
911a91c39cabcb H ("kconfig: rename silentoldconfig to syncconfig")
59889300274569 (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore")
9a8dfb394c0467 ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile")
833e622459432e H ("genksyms: generate lexer and parser during build instead of shipping")
b23d1a241f4eb4 H ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically")
e9781b52d4e0e3 H ("kbuild: add PYTHON2 and PYTHON3 variables")
The commits marked with 'H' are assessed as "hard" (build will fail)
prerequisites and the rest of them are assessed as "soft" prerequisites
for the re-sync. In spite of relatively high number of non-H commits,
they belong to this Kconfig update topic-wise and decrease the number of
cherry pick conflicts for many commits in this series. Additional effort
can be put in eliminating the soft prerequisites, if really needed.
The commits which contributed to this Kconfig re-sync are listed below.
Whenever a conflict resolution has been performed (mostly by hand, but
sometimes automatically by git), it is revealed by the '!' sign in the
second column, which means a patch id mismatch between Linux and U-boot
commits:
9be3213b14d44f ("gconfig: remove misleading parentheses around a condition")
ff85a1a80e0034 ("kconfig: Check for libncurses before menuconfig")
ad8181060788c8 ("kconfig: fix sparse warnings in nconfig")
cb77f0d623ff33 ! ("scripts: Switch to more portable Perl shebang")
bb3290d91695bb ! ("Remove gperf usage from toolchain")
c054be10ffdbd5 ("remove gperf left-overs from build system")
b24413180f5600 ! ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license")
9059a3493efea6 ! ("kconfig: fix relational operators for bool and tristate symbols")
2c37e08464a850 ("kconfig: Warn if choice default is not in choice")
33ca1a24866373 ("kconfig: Document the 'menu' struct")
52aede4ba5efd1 ("kconfig: Document the 'symbol' struct")
c873443430ebd1 ("kconfig: Sync zconf.y with zconf.tab.c_shipped")
9a826842ff2fbd ("kconfig: Rename menu_check_dep() to rewrite_m()")
fa8cedaef814ce ("kconfig: Clarify expression rewriting")
f77850d3fe0c96 ("kconfig: Clean up modules handling and fix crash")
e3b03bf29d6b99 ("kconfig: display recursive dependency resolution hint just once")
73a4f6dbe70a1b ! ("kbuild: add LEX and YACC variables")
033dba2ec06c47 ! ("kbuild: prepare to remove C files pre-generated by flex and bison")
29c833061c1d8c ("kconfig: generate lexer and parser during build instead of shipping")
26e47a3c11a25c ("kconfig: Don't leak symbol names during parsing")
24161a6711c945 ("kconfig: Don't leak 'source' filenames during parsing")
bc28fe1d5ede88 ("kconfig: Don't leak 'option' arguments during parsing")
0724a7c32a54e3 ("kconfig: Don't leak main menus during parsing")
ae7440ef0c8013 ("kconfig: Fix automatic menu creation mem leak")
5b1374b3b3c2fc ("kconfig: Fix expr_free() E_NOT leak")
7cf33f88e29410 ("kconfig: Fix choice symbol expression leak")
05cccce580456d ("kconfig: Document automatic submenu creation code")
0735f7e5def2ab ("kconfig: Document important expression functions")
df60f4b92d3d0b ("kconfig: Remove menu_end_entry()")
b92d804a51796b ("kconfig: drop 'boolean' keyword")
6479f327dea60d ("kconfig: Warn if there is more than one help text")
52e58a3caeba5d ("kconfig: make input_mode static")
5a3dc717b3c785 ("kconfig: make xfgets() really static")
84dd95d4f87a0d ("kconfig: make conf_unsaved a local variable of conf_read()")
765f4cdef6f80d ("kconfig: use default 'yy' prefix for lexer and parser")
eea199b445f64c ("kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX")
e71de5ee08dcb0 ("kbuild: remove remaining use of undefined YACC_PREFIX")
d59fbbd09d5d6b ! ("kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)")
3e41ba05b6d60c ("kconfig: Document SYMBOL_OPTIONAL logic")
d3465af60f4471 ("kconfig: Clarify choice dependency propagation")
9d1a9e8bc18bea ("kconfig: Document 'if' flattening logic")
b53688014e3325 ("kconfig: Clarify menu and 'if' dependency propagation")
d0fd0428ecf04b ("kconfig: fix make xconfig when gettext is missing")
312ee68752faaa ("kconfig: announce removal of oldnoconfig if used")
1ccb27143360bd ("kconfig: make "Selected by:" and "Implied by:" readable")
cedd55d49dee94 ! ("kconfig: Remove silentoldconfig from help and docs; fix kconfig/conf's help")
1b9eda2e4892cb ("kconfig: Warn if help text is blank")
cb67ab2cd2b8ab ("kconfig: do not write choice values when their dependency becomes n")
4f208f392103e8 ("kconfig: show '?' prompt even if no help text is available")
cd58a91def2acc ("kconfig: remove 'config*' pattern from .gitignnore")
d2a04648a5dbc3 ("kconfig: remove check_stdin()")
f3ff6fb5db68bc ("kconfig: echo stdin to stdout if either is redirected")
9e3e10c725360b ("kconfig: send error messages to stderr")
d717f24d8c6808 ("kconfig: add xrealloc() helper")
523ca58b7db2e3 ("kconfig: remove const qualifier from sym_expand_string_value()")
cd81fc82b93fa4 ("kconfig: add xstrdup() helper")
f4bc1eefc1608e ("kconfig: set SYMBOL_AUTO to the symbol marked with defconfig_list")
bf0bbdcf100322 ("kconfig: Don't leak choice names during parsing")
1a90ce36c6eff6 ("kconfig: Update ncurses package names for menuconfig")
5ae6fcc4bb82bd ("kconfig: fix line number in recursive inclusion error message")
07a422bb213adb ! ("kbuild: restore autoksyms.h touch to the top Makefile")
9a47ceec543bfb ("kconfig: clean-up reverse dependency help implementation")
d9119b5925a03b ("kconfig: Print reverse dependencies in groups")
f467c5640c29ad ("kconfig: only write '# CONFIG_FOO is not set' for visible symbols")
59a80b5e892dde ("kconfig: do not call check_conf() for olddefconfig")
4bb3a5b085cd6f ("kconfig: remove unneeded input_mode test in conf()")
99f0b6578bab44 ("kconfig: remove redundant input_mode test for check_conf() loop")
2aad9b89621386 ("kconfig: hide irrelevant sub-menus for oldconfig")
81d2bc2273052e ("kconfig: invoke oldconfig instead of silentoldconfig from local*config")
911a91c39cabcb ! ("kconfig: rename silentoldconfig to syncconfig")
2a61625835c7c8 ! ("kconfig: remove redundant streamline_config.pl prerequisite")
022a4bf6b59dfd ("kconfig: tests: add framework for Kconfig unit testing")
1903c511905984 ("kconfig: tests: add basic choice tests")
49ac3c0c3aa3b7 ("kconfig: tests: test automatic submenu creation")
b76960c0f6b25d ("kconfig: tests: test if new symbols in choice are asked")
930c429a656fdb ("kconfig: tests: check unneeded "is not set" with unmet dependency")
ee236610653ede ("kconfig: tests: check visibility of tristate choice values in y choice")
beaaddb625400e ("kconfig: tests: test defconfig when two choices interact")
3e4888c2e3d77d ("kconfig: tests: test randconfig for choice in choice")
29c434f367ea7b ("kconfig: tests: test if recursive dependencies are detected")
e2c75e7667c737 ("kconfig: tests: test if recursive inclusion is detected")
f622f827958162 ("kconfig: warn unmet direct dependency of tristate symbols selected by y")
f8f69dc0b4e070 ("kconfig: make unmet dependency warnings readable")
26561514cc9def ("kconfig: do not include both curses.h and ncurses.h for nconfig")
32a94b8b0c3e5a ("kconfig: remove duplicated file name and lineno of recursive inclusion")
379a8eb8eb1a55 ("kconfig: detect recursive inclusion earlier")
18492685e479fd ("kconfig: use yylineno option instead of manual lineno increments")
59889300274569 ! (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore")
9a8dfb394c0467 ! ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile")
833e622459432e ! ("genksyms: generate lexer and parser during build instead of shipping")
b23d1a241f4eb4 ! ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically")
17baab68d337a0 ("kconfig: extend output of 'listnewconfig'")
e9781b52d4e0e3 ! ("kbuild: add PYTHON2 and PYTHON3 variables")
The current Kconfig update generates below build-time warnings:
YACC scripts/dtc/dtc-parser.tab.h
scripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
YACC scripts/dtc/dtc-parser.tab.c
scripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
This seems to happen because the Kbuild updates apparently didn't make
room for both "*shipped"-based builds and flex/bison-based builds. A
similar problem has been reported for genksyms parser in v4.17-rc1
commit 833e622459432e ("genksyms: generate lexer and parser during build
instead of shipping"). I have figured out empirically that the warnings
are healed after updating the in-tree U-boot DTC to upstream v1.4.6-9,
same as done by Linux v4.17-rc1 commit 9130ba88464032 ("scripts/dtc:
Update to upstream version v1.4.6-9-gaadd0b65c987"). Whether fixing the
DTC-related yacc warnings should be done together with the Kconfig
re-sync, I would like to hear from community.
My testing was limited to:
- make defconfig all
- make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- r8a7795_ulcb_defconfig all
- comparing .config before and after the re-sync
- running the newly imported Kconfig unit tests as seen below:
$ make testconfig
Tested-by: Petr Vorel <petr.vorel@gmail.com>
============================= test session starts =============================
scripts/kconfig/tests/auto_submenu/__init__.py::test PASSED [ 7%]
scripts/kconfig/tests/choice/__init__.py::test_oldask0 PASSED [ 14%]
scripts/kconfig/tests/choice/__init__.py::test_oldask1 PASSED [ 21%]
scripts/kconfig/tests/choice/__init__.py::test_allyes PASSED [ 28%]
scripts/kconfig/tests/choice/__init__.py::test_allmod PASSED [ 35%]
scripts/kconfig/tests/choice/__init__.py::test_allno PASSED [ 42%]
scripts/kconfig/tests/choice/__init__.py::test_alldef PASSED [ 50%]
scripts/kconfig/tests/choice_value_with_m_dep/__init__.py::test PASSED [ 57%]
scripts/kconfig/tests/err_recursive_inc/__init__.py::test PASSED [ 64%]
scripts/kconfig/tests/inter_choice/__init__.py::test PASSED [ 71%]
scripts/kconfig/tests/new_choice_with_dep/__init__.py::test PASSED [ 78%]
scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py::test PASSED [ 85%]
scripts/kconfig/tests/rand_nested_choice/__init__.py::test PASSED [ 92%]
scripts/kconfig/tests/warn_recursive_dep/__init__.py::test PASSED [100%]
========================== 14 passed in 0.34 seconds ==========================
Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Petr Vorel <petr.vorel@gmail.com>
2018-05-19 12:13:50 +00:00
|
|
|
sym->def[def].val = xstrdup(p);
|
2014-07-30 05:08:13 +00:00
|
|
|
sym->flags |= def_flags;
|
|
|
|
} else {
|
|
|
|
if (def != S_DEF_AUTO)
|
|
|
|
conf_warning("symbol value '%s' invalid for %s",
|
|
|
|
p, sym->name);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define LINE_GROWTH 16
|
|
|
|
static int add_byte(int c, char **lineptr, size_t slen, size_t *n)
|
|
|
|
{
|
|
|
|
char *nline;
|
|
|
|
size_t new_size = slen + 1;
|
|
|
|
if (new_size > *n) {
|
|
|
|
new_size += LINE_GROWTH - 1;
|
|
|
|
new_size *= 2;
|
kconfig: re-sync with Linux 4.17-rc4
Align Kconfig to Linux 4.17-rc4 with minimal impact on non-kconfig files.
Previous Kconfig sync was done by commit bf7ab1e70fd762 ("kconfig:
re-sync with Linux 4.10") and it achieved almost perfect alignment with
a few (intended) exceptions, caused by below U-boot commits:
[A] v2015.04 5f9eb2207500 ("kbuild: remove scripts/multiconfig.sh")
[B] v2015.07 20c20826efab ("Kconfig: Enable usage of escape char '\' in string values")
[C] v2016.01 da58dec86616 ("Various Makefiles: Add SPDX-License-Identifier tags")
[D] v2016.03 5b8031ccb4ed ("Add more SPDX-License-Identifier tags")
[E] v2016.03 192bc6948b02 ("Fix GCC format-security errors and convert sprintfs.")
Here is the list of Kconfig commits which followed the v4.10 alignment:
[F] v2018.01 0931ed3c0d0f ("kconfig/symbol.c: use correct pointer type argument for sizeof")
[G] v2018.03 1414e09b4f25 ("kconfig: revert change that was not needed for -Wformat-security")
[H] v2018.05 83d290c56fab ("SPDX: Convert all of our single license tags to Linux Kernel style")
Commit [F] was subsequently applied to Linux kernel as commit [I]
with the same patch id, so it won't contribute to further misalignment.
[I] v4.15-rc1 88127dae6ed9 ("kconfig/symbol.c: use correct pointer type argument for sizeof")
Commit [G] is a Kconfig-specific revert of commit [E].
Commit [H] relocated and reformatted the license doing no functional change.
In summary, the only functional change that makes U-boot Kconfig
diverge from Linux Kconfig is commit [B]. After a brief analysis,
the purpose of [B] seems to be placing "\n" literals in string symbols
like CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n" in order to pass
them directly to printf and expect correct output at runtime. Currently,
Linux doesn't seem to have this requirement, so for the moment [B] looks
like a U-boot specific feature/fix. From point of view of further Kconfig
alignment and backporting efforts, it is highly desired that commits
like [B] are propagated to Linux and any Kconfig fixes/features are
contributed to Linux kernel first. This specific Kconfig re-sync just
keeps [B] in place.
Contrary to 4.10 Kconfig re-sync (which achieves zero non-kconfig
changes), 4.17-rc4 re-sync does some amount of updates in Kbuild
(striving to keep them at minimum), due to a number of reasons:
* Kbuild is affected by the removal of Kconfig "*shipped" files and now
requires flex and bison pre-installed on the host.
* PYTHON{2,3} variables are defined in top-level Makefile as
prerequisite for running the newly developed Kconfig unit tests.
* silentoldconfig becomes an "internal implementation detail" deprecated
for external use, being renamed to syncconfig.
The exact non-kconfig files touched by this commit are:
$ git show --format="" --stat -- ':!scripts/kconfig'
.gitignore | 2 ++
Makefile | 9 +++++++--
scripts/Makefile.build | 11 +++++++++++
scripts/Makefile.lib | 41 ++++++++++++-----------------------------
The imported Linux commits touching the above files are:
c054be10ffdbd5 ("remove gperf left-overs from build system")
73a4f6dbe70a1b ("kbuild: add LEX and YACC variables")
033dba2ec06c47 ("kbuild: prepare to remove C files pre-generated by flex and bison")
eea199b445f64c ("kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX")
e71de5ee08dcb0 ("kbuild: remove remaining use of undefined YACC_PREFIX")
d59fbbd09d5d6b ("kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)")
911a91c39cabcb H ("kconfig: rename silentoldconfig to syncconfig")
59889300274569 (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore")
9a8dfb394c0467 ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile")
833e622459432e H ("genksyms: generate lexer and parser during build instead of shipping")
b23d1a241f4eb4 H ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically")
e9781b52d4e0e3 H ("kbuild: add PYTHON2 and PYTHON3 variables")
The commits marked with 'H' are assessed as "hard" (build will fail)
prerequisites and the rest of them are assessed as "soft" prerequisites
for the re-sync. In spite of relatively high number of non-H commits,
they belong to this Kconfig update topic-wise and decrease the number of
cherry pick conflicts for many commits in this series. Additional effort
can be put in eliminating the soft prerequisites, if really needed.
The commits which contributed to this Kconfig re-sync are listed below.
Whenever a conflict resolution has been performed (mostly by hand, but
sometimes automatically by git), it is revealed by the '!' sign in the
second column, which means a patch id mismatch between Linux and U-boot
commits:
9be3213b14d44f ("gconfig: remove misleading parentheses around a condition")
ff85a1a80e0034 ("kconfig: Check for libncurses before menuconfig")
ad8181060788c8 ("kconfig: fix sparse warnings in nconfig")
cb77f0d623ff33 ! ("scripts: Switch to more portable Perl shebang")
bb3290d91695bb ! ("Remove gperf usage from toolchain")
c054be10ffdbd5 ("remove gperf left-overs from build system")
b24413180f5600 ! ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license")
9059a3493efea6 ! ("kconfig: fix relational operators for bool and tristate symbols")
2c37e08464a850 ("kconfig: Warn if choice default is not in choice")
33ca1a24866373 ("kconfig: Document the 'menu' struct")
52aede4ba5efd1 ("kconfig: Document the 'symbol' struct")
c873443430ebd1 ("kconfig: Sync zconf.y with zconf.tab.c_shipped")
9a826842ff2fbd ("kconfig: Rename menu_check_dep() to rewrite_m()")
fa8cedaef814ce ("kconfig: Clarify expression rewriting")
f77850d3fe0c96 ("kconfig: Clean up modules handling and fix crash")
e3b03bf29d6b99 ("kconfig: display recursive dependency resolution hint just once")
73a4f6dbe70a1b ! ("kbuild: add LEX and YACC variables")
033dba2ec06c47 ! ("kbuild: prepare to remove C files pre-generated by flex and bison")
29c833061c1d8c ("kconfig: generate lexer and parser during build instead of shipping")
26e47a3c11a25c ("kconfig: Don't leak symbol names during parsing")
24161a6711c945 ("kconfig: Don't leak 'source' filenames during parsing")
bc28fe1d5ede88 ("kconfig: Don't leak 'option' arguments during parsing")
0724a7c32a54e3 ("kconfig: Don't leak main menus during parsing")
ae7440ef0c8013 ("kconfig: Fix automatic menu creation mem leak")
5b1374b3b3c2fc ("kconfig: Fix expr_free() E_NOT leak")
7cf33f88e29410 ("kconfig: Fix choice symbol expression leak")
05cccce580456d ("kconfig: Document automatic submenu creation code")
0735f7e5def2ab ("kconfig: Document important expression functions")
df60f4b92d3d0b ("kconfig: Remove menu_end_entry()")
b92d804a51796b ("kconfig: drop 'boolean' keyword")
6479f327dea60d ("kconfig: Warn if there is more than one help text")
52e58a3caeba5d ("kconfig: make input_mode static")
5a3dc717b3c785 ("kconfig: make xfgets() really static")
84dd95d4f87a0d ("kconfig: make conf_unsaved a local variable of conf_read()")
765f4cdef6f80d ("kconfig: use default 'yy' prefix for lexer and parser")
eea199b445f64c ("kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX")
e71de5ee08dcb0 ("kbuild: remove remaining use of undefined YACC_PREFIX")
d59fbbd09d5d6b ! ("kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)")
3e41ba05b6d60c ("kconfig: Document SYMBOL_OPTIONAL logic")
d3465af60f4471 ("kconfig: Clarify choice dependency propagation")
9d1a9e8bc18bea ("kconfig: Document 'if' flattening logic")
b53688014e3325 ("kconfig: Clarify menu and 'if' dependency propagation")
d0fd0428ecf04b ("kconfig: fix make xconfig when gettext is missing")
312ee68752faaa ("kconfig: announce removal of oldnoconfig if used")
1ccb27143360bd ("kconfig: make "Selected by:" and "Implied by:" readable")
cedd55d49dee94 ! ("kconfig: Remove silentoldconfig from help and docs; fix kconfig/conf's help")
1b9eda2e4892cb ("kconfig: Warn if help text is blank")
cb67ab2cd2b8ab ("kconfig: do not write choice values when their dependency becomes n")
4f208f392103e8 ("kconfig: show '?' prompt even if no help text is available")
cd58a91def2acc ("kconfig: remove 'config*' pattern from .gitignnore")
d2a04648a5dbc3 ("kconfig: remove check_stdin()")
f3ff6fb5db68bc ("kconfig: echo stdin to stdout if either is redirected")
9e3e10c725360b ("kconfig: send error messages to stderr")
d717f24d8c6808 ("kconfig: add xrealloc() helper")
523ca58b7db2e3 ("kconfig: remove const qualifier from sym_expand_string_value()")
cd81fc82b93fa4 ("kconfig: add xstrdup() helper")
f4bc1eefc1608e ("kconfig: set SYMBOL_AUTO to the symbol marked with defconfig_list")
bf0bbdcf100322 ("kconfig: Don't leak choice names during parsing")
1a90ce36c6eff6 ("kconfig: Update ncurses package names for menuconfig")
5ae6fcc4bb82bd ("kconfig: fix line number in recursive inclusion error message")
07a422bb213adb ! ("kbuild: restore autoksyms.h touch to the top Makefile")
9a47ceec543bfb ("kconfig: clean-up reverse dependency help implementation")
d9119b5925a03b ("kconfig: Print reverse dependencies in groups")
f467c5640c29ad ("kconfig: only write '# CONFIG_FOO is not set' for visible symbols")
59a80b5e892dde ("kconfig: do not call check_conf() for olddefconfig")
4bb3a5b085cd6f ("kconfig: remove unneeded input_mode test in conf()")
99f0b6578bab44 ("kconfig: remove redundant input_mode test for check_conf() loop")
2aad9b89621386 ("kconfig: hide irrelevant sub-menus for oldconfig")
81d2bc2273052e ("kconfig: invoke oldconfig instead of silentoldconfig from local*config")
911a91c39cabcb ! ("kconfig: rename silentoldconfig to syncconfig")
2a61625835c7c8 ! ("kconfig: remove redundant streamline_config.pl prerequisite")
022a4bf6b59dfd ("kconfig: tests: add framework for Kconfig unit testing")
1903c511905984 ("kconfig: tests: add basic choice tests")
49ac3c0c3aa3b7 ("kconfig: tests: test automatic submenu creation")
b76960c0f6b25d ("kconfig: tests: test if new symbols in choice are asked")
930c429a656fdb ("kconfig: tests: check unneeded "is not set" with unmet dependency")
ee236610653ede ("kconfig: tests: check visibility of tristate choice values in y choice")
beaaddb625400e ("kconfig: tests: test defconfig when two choices interact")
3e4888c2e3d77d ("kconfig: tests: test randconfig for choice in choice")
29c434f367ea7b ("kconfig: tests: test if recursive dependencies are detected")
e2c75e7667c737 ("kconfig: tests: test if recursive inclusion is detected")
f622f827958162 ("kconfig: warn unmet direct dependency of tristate symbols selected by y")
f8f69dc0b4e070 ("kconfig: make unmet dependency warnings readable")
26561514cc9def ("kconfig: do not include both curses.h and ncurses.h for nconfig")
32a94b8b0c3e5a ("kconfig: remove duplicated file name and lineno of recursive inclusion")
379a8eb8eb1a55 ("kconfig: detect recursive inclusion earlier")
18492685e479fd ("kconfig: use yylineno option instead of manual lineno increments")
59889300274569 ! (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore")
9a8dfb394c0467 ! ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile")
833e622459432e ! ("genksyms: generate lexer and parser during build instead of shipping")
b23d1a241f4eb4 ! ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically")
17baab68d337a0 ("kconfig: extend output of 'listnewconfig'")
e9781b52d4e0e3 ! ("kbuild: add PYTHON2 and PYTHON3 variables")
The current Kconfig update generates below build-time warnings:
YACC scripts/dtc/dtc-parser.tab.h
scripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
YACC scripts/dtc/dtc-parser.tab.c
scripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
This seems to happen because the Kbuild updates apparently didn't make
room for both "*shipped"-based builds and flex/bison-based builds. A
similar problem has been reported for genksyms parser in v4.17-rc1
commit 833e622459432e ("genksyms: generate lexer and parser during build
instead of shipping"). I have figured out empirically that the warnings
are healed after updating the in-tree U-boot DTC to upstream v1.4.6-9,
same as done by Linux v4.17-rc1 commit 9130ba88464032 ("scripts/dtc:
Update to upstream version v1.4.6-9-gaadd0b65c987"). Whether fixing the
DTC-related yacc warnings should be done together with the Kconfig
re-sync, I would like to hear from community.
My testing was limited to:
- make defconfig all
- make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- r8a7795_ulcb_defconfig all
- comparing .config before and after the re-sync
- running the newly imported Kconfig unit tests as seen below:
$ make testconfig
Tested-by: Petr Vorel <petr.vorel@gmail.com>
============================= test session starts =============================
scripts/kconfig/tests/auto_submenu/__init__.py::test PASSED [ 7%]
scripts/kconfig/tests/choice/__init__.py::test_oldask0 PASSED [ 14%]
scripts/kconfig/tests/choice/__init__.py::test_oldask1 PASSED [ 21%]
scripts/kconfig/tests/choice/__init__.py::test_allyes PASSED [ 28%]
scripts/kconfig/tests/choice/__init__.py::test_allmod PASSED [ 35%]
scripts/kconfig/tests/choice/__init__.py::test_allno PASSED [ 42%]
scripts/kconfig/tests/choice/__init__.py::test_alldef PASSED [ 50%]
scripts/kconfig/tests/choice_value_with_m_dep/__init__.py::test PASSED [ 57%]
scripts/kconfig/tests/err_recursive_inc/__init__.py::test PASSED [ 64%]
scripts/kconfig/tests/inter_choice/__init__.py::test PASSED [ 71%]
scripts/kconfig/tests/new_choice_with_dep/__init__.py::test PASSED [ 78%]
scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py::test PASSED [ 85%]
scripts/kconfig/tests/rand_nested_choice/__init__.py::test PASSED [ 92%]
scripts/kconfig/tests/warn_recursive_dep/__init__.py::test PASSED [100%]
========================== 14 passed in 0.34 seconds ==========================
Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Petr Vorel <petr.vorel@gmail.com>
2018-05-19 12:13:50 +00:00
|
|
|
nline = xrealloc(*lineptr, new_size);
|
2014-07-30 05:08:13 +00:00
|
|
|
if (!nline)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
*lineptr = nline;
|
|
|
|
*n = new_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
(*lineptr)[slen] = c;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t compat_getline(char **lineptr, size_t *n, FILE *stream)
|
|
|
|
{
|
|
|
|
char *line = *lineptr;
|
|
|
|
size_t slen = 0;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
int c = getc(stream);
|
|
|
|
|
|
|
|
switch (c) {
|
|
|
|
case '\n':
|
|
|
|
if (add_byte(c, &line, slen, n) < 0)
|
|
|
|
goto e_out;
|
|
|
|
slen++;
|
|
|
|
/* fall through */
|
|
|
|
case EOF:
|
|
|
|
if (add_byte('\0', &line, slen, n) < 0)
|
|
|
|
goto e_out;
|
|
|
|
*lineptr = line;
|
|
|
|
if (slen == 0)
|
|
|
|
return -1;
|
|
|
|
return slen;
|
|
|
|
default:
|
|
|
|
if (add_byte(c, &line, slen, n) < 0)
|
|
|
|
goto e_out;
|
|
|
|
slen++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
e_out:
|
|
|
|
line[slen-1] = '\0';
|
|
|
|
*lineptr = line;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int conf_read_simple(const char *name, int def)
|
|
|
|
{
|
|
|
|
FILE *in = NULL;
|
|
|
|
char *line = NULL;
|
|
|
|
size_t line_asize = 0;
|
|
|
|
char *p, *p2;
|
|
|
|
struct symbol *sym;
|
|
|
|
int i, def_flags;
|
|
|
|
|
|
|
|
if (name) {
|
|
|
|
in = zconf_fopen(name);
|
|
|
|
} else {
|
|
|
|
struct property *prop;
|
|
|
|
|
|
|
|
name = conf_get_configname();
|
|
|
|
in = zconf_fopen(name);
|
|
|
|
if (in)
|
|
|
|
goto load;
|
|
|
|
sym_add_change_count(1);
|
2017-02-11 03:39:54 +00:00
|
|
|
if (!sym_defconfig_list)
|
2014-07-30 05:08:13 +00:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
for_all_defaults(sym_defconfig_list, prop) {
|
|
|
|
if (expr_calc_value(prop->visible.expr) == no ||
|
|
|
|
prop->expr->type != E_SYMBOL)
|
|
|
|
continue;
|
2020-03-11 22:11:17 +00:00
|
|
|
sym_calc_value(prop->expr->left.sym);
|
|
|
|
name = sym_get_string_value(prop->expr->left.sym);
|
2014-07-30 05:08:13 +00:00
|
|
|
in = zconf_fopen(name);
|
|
|
|
if (in) {
|
2020-03-11 22:11:17 +00:00
|
|
|
conf_message("using defaults found in %s",
|
2014-07-30 05:08:13 +00:00
|
|
|
name);
|
|
|
|
goto load;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!in)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
load:
|
|
|
|
conf_filename = name;
|
|
|
|
conf_lineno = 0;
|
|
|
|
conf_warnings = 0;
|
|
|
|
|
|
|
|
def_flags = SYMBOL_DEF << def;
|
|
|
|
for_all_symbols(i, sym) {
|
|
|
|
sym->flags |= SYMBOL_CHANGED;
|
|
|
|
sym->flags &= ~(def_flags|SYMBOL_VALID);
|
|
|
|
if (sym_is_choice(sym))
|
|
|
|
sym->flags |= def_flags;
|
|
|
|
switch (sym->type) {
|
|
|
|
case S_INT:
|
|
|
|
case S_HEX:
|
|
|
|
case S_STRING:
|
|
|
|
if (sym->def[def].val)
|
|
|
|
free(sym->def[def].val);
|
|
|
|
/* fall through */
|
|
|
|
default:
|
|
|
|
sym->def[def].val = NULL;
|
|
|
|
sym->def[def].tri = no;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
while (compat_getline(&line, &line_asize, in) != -1) {
|
|
|
|
conf_lineno++;
|
|
|
|
sym = NULL;
|
|
|
|
if (line[0] == '#') {
|
|
|
|
if (memcmp(line + 2, CONFIG_, strlen(CONFIG_)))
|
|
|
|
continue;
|
|
|
|
p = strchr(line + 2 + strlen(CONFIG_), ' ');
|
|
|
|
if (!p)
|
|
|
|
continue;
|
|
|
|
*p++ = 0;
|
|
|
|
if (strncmp(p, "is not set", 10))
|
|
|
|
continue;
|
|
|
|
if (def == S_DEF_USER) {
|
|
|
|
sym = sym_find(line + 2 + strlen(CONFIG_));
|
|
|
|
if (!sym) {
|
|
|
|
sym_add_change_count(1);
|
|
|
|
goto setsym;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
sym = sym_lookup(line + 2 + strlen(CONFIG_), 0);
|
|
|
|
if (sym->type == S_UNKNOWN)
|
|
|
|
sym->type = S_BOOLEAN;
|
|
|
|
}
|
|
|
|
if (sym->flags & def_flags) {
|
|
|
|
conf_warning("override: reassigning to symbol %s", sym->name);
|
|
|
|
}
|
|
|
|
switch (sym->type) {
|
|
|
|
case S_BOOLEAN:
|
|
|
|
case S_TRISTATE:
|
|
|
|
sym->def[def].tri = no;
|
|
|
|
sym->flags |= def_flags;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
;
|
|
|
|
}
|
|
|
|
} else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) {
|
|
|
|
p = strchr(line + strlen(CONFIG_), '=');
|
|
|
|
if (!p)
|
|
|
|
continue;
|
|
|
|
*p++ = 0;
|
|
|
|
p2 = strchr(p, '\n');
|
|
|
|
if (p2) {
|
|
|
|
*p2-- = 0;
|
|
|
|
if (*p2 == '\r')
|
|
|
|
*p2 = 0;
|
|
|
|
}
|
|
|
|
if (def == S_DEF_USER) {
|
|
|
|
sym = sym_find(line + strlen(CONFIG_));
|
|
|
|
if (!sym) {
|
|
|
|
sym_add_change_count(1);
|
|
|
|
goto setsym;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
sym = sym_lookup(line + strlen(CONFIG_), 0);
|
|
|
|
if (sym->type == S_UNKNOWN)
|
|
|
|
sym->type = S_OTHER;
|
|
|
|
}
|
|
|
|
if (sym->flags & def_flags) {
|
|
|
|
conf_warning("override: reassigning to symbol %s", sym->name);
|
|
|
|
}
|
|
|
|
if (conf_set_sym_val(sym, def, def_flags, p))
|
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
if (line[0] != '\r' && line[0] != '\n')
|
2017-02-11 03:39:54 +00:00
|
|
|
conf_warning("unexpected data: %.*s",
|
|
|
|
(int)strcspn(line, "\r\n"), line);
|
|
|
|
|
2014-07-30 05:08:13 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
setsym:
|
|
|
|
if (sym && sym_is_choice_value(sym)) {
|
|
|
|
struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
|
|
|
|
switch (sym->def[def].tri) {
|
|
|
|
case no:
|
|
|
|
break;
|
|
|
|
case mod:
|
|
|
|
if (cs->def[def].tri == yes) {
|
|
|
|
conf_warning("%s creates inconsistent choice state", sym->name);
|
|
|
|
cs->flags &= ~def_flags;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case yes:
|
|
|
|
if (cs->def[def].tri != no)
|
|
|
|
conf_warning("override: %s changes choice state", sym->name);
|
|
|
|
cs->def[def].val = sym;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
free(line);
|
|
|
|
fclose(in);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int conf_read(const char *name)
|
|
|
|
{
|
|
|
|
struct symbol *sym;
|
kconfig: re-sync with Linux 4.17-rc4
Align Kconfig to Linux 4.17-rc4 with minimal impact on non-kconfig files.
Previous Kconfig sync was done by commit bf7ab1e70fd762 ("kconfig:
re-sync with Linux 4.10") and it achieved almost perfect alignment with
a few (intended) exceptions, caused by below U-boot commits:
[A] v2015.04 5f9eb2207500 ("kbuild: remove scripts/multiconfig.sh")
[B] v2015.07 20c20826efab ("Kconfig: Enable usage of escape char '\' in string values")
[C] v2016.01 da58dec86616 ("Various Makefiles: Add SPDX-License-Identifier tags")
[D] v2016.03 5b8031ccb4ed ("Add more SPDX-License-Identifier tags")
[E] v2016.03 192bc6948b02 ("Fix GCC format-security errors and convert sprintfs.")
Here is the list of Kconfig commits which followed the v4.10 alignment:
[F] v2018.01 0931ed3c0d0f ("kconfig/symbol.c: use correct pointer type argument for sizeof")
[G] v2018.03 1414e09b4f25 ("kconfig: revert change that was not needed for -Wformat-security")
[H] v2018.05 83d290c56fab ("SPDX: Convert all of our single license tags to Linux Kernel style")
Commit [F] was subsequently applied to Linux kernel as commit [I]
with the same patch id, so it won't contribute to further misalignment.
[I] v4.15-rc1 88127dae6ed9 ("kconfig/symbol.c: use correct pointer type argument for sizeof")
Commit [G] is a Kconfig-specific revert of commit [E].
Commit [H] relocated and reformatted the license doing no functional change.
In summary, the only functional change that makes U-boot Kconfig
diverge from Linux Kconfig is commit [B]. After a brief analysis,
the purpose of [B] seems to be placing "\n" literals in string symbols
like CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n" in order to pass
them directly to printf and expect correct output at runtime. Currently,
Linux doesn't seem to have this requirement, so for the moment [B] looks
like a U-boot specific feature/fix. From point of view of further Kconfig
alignment and backporting efforts, it is highly desired that commits
like [B] are propagated to Linux and any Kconfig fixes/features are
contributed to Linux kernel first. This specific Kconfig re-sync just
keeps [B] in place.
Contrary to 4.10 Kconfig re-sync (which achieves zero non-kconfig
changes), 4.17-rc4 re-sync does some amount of updates in Kbuild
(striving to keep them at minimum), due to a number of reasons:
* Kbuild is affected by the removal of Kconfig "*shipped" files and now
requires flex and bison pre-installed on the host.
* PYTHON{2,3} variables are defined in top-level Makefile as
prerequisite for running the newly developed Kconfig unit tests.
* silentoldconfig becomes an "internal implementation detail" deprecated
for external use, being renamed to syncconfig.
The exact non-kconfig files touched by this commit are:
$ git show --format="" --stat -- ':!scripts/kconfig'
.gitignore | 2 ++
Makefile | 9 +++++++--
scripts/Makefile.build | 11 +++++++++++
scripts/Makefile.lib | 41 ++++++++++++-----------------------------
The imported Linux commits touching the above files are:
c054be10ffdbd5 ("remove gperf left-overs from build system")
73a4f6dbe70a1b ("kbuild: add LEX and YACC variables")
033dba2ec06c47 ("kbuild: prepare to remove C files pre-generated by flex and bison")
eea199b445f64c ("kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX")
e71de5ee08dcb0 ("kbuild: remove remaining use of undefined YACC_PREFIX")
d59fbbd09d5d6b ("kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)")
911a91c39cabcb H ("kconfig: rename silentoldconfig to syncconfig")
59889300274569 (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore")
9a8dfb394c0467 ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile")
833e622459432e H ("genksyms: generate lexer and parser during build instead of shipping")
b23d1a241f4eb4 H ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically")
e9781b52d4e0e3 H ("kbuild: add PYTHON2 and PYTHON3 variables")
The commits marked with 'H' are assessed as "hard" (build will fail)
prerequisites and the rest of them are assessed as "soft" prerequisites
for the re-sync. In spite of relatively high number of non-H commits,
they belong to this Kconfig update topic-wise and decrease the number of
cherry pick conflicts for many commits in this series. Additional effort
can be put in eliminating the soft prerequisites, if really needed.
The commits which contributed to this Kconfig re-sync are listed below.
Whenever a conflict resolution has been performed (mostly by hand, but
sometimes automatically by git), it is revealed by the '!' sign in the
second column, which means a patch id mismatch between Linux and U-boot
commits:
9be3213b14d44f ("gconfig: remove misleading parentheses around a condition")
ff85a1a80e0034 ("kconfig: Check for libncurses before menuconfig")
ad8181060788c8 ("kconfig: fix sparse warnings in nconfig")
cb77f0d623ff33 ! ("scripts: Switch to more portable Perl shebang")
bb3290d91695bb ! ("Remove gperf usage from toolchain")
c054be10ffdbd5 ("remove gperf left-overs from build system")
b24413180f5600 ! ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license")
9059a3493efea6 ! ("kconfig: fix relational operators for bool and tristate symbols")
2c37e08464a850 ("kconfig: Warn if choice default is not in choice")
33ca1a24866373 ("kconfig: Document the 'menu' struct")
52aede4ba5efd1 ("kconfig: Document the 'symbol' struct")
c873443430ebd1 ("kconfig: Sync zconf.y with zconf.tab.c_shipped")
9a826842ff2fbd ("kconfig: Rename menu_check_dep() to rewrite_m()")
fa8cedaef814ce ("kconfig: Clarify expression rewriting")
f77850d3fe0c96 ("kconfig: Clean up modules handling and fix crash")
e3b03bf29d6b99 ("kconfig: display recursive dependency resolution hint just once")
73a4f6dbe70a1b ! ("kbuild: add LEX and YACC variables")
033dba2ec06c47 ! ("kbuild: prepare to remove C files pre-generated by flex and bison")
29c833061c1d8c ("kconfig: generate lexer and parser during build instead of shipping")
26e47a3c11a25c ("kconfig: Don't leak symbol names during parsing")
24161a6711c945 ("kconfig: Don't leak 'source' filenames during parsing")
bc28fe1d5ede88 ("kconfig: Don't leak 'option' arguments during parsing")
0724a7c32a54e3 ("kconfig: Don't leak main menus during parsing")
ae7440ef0c8013 ("kconfig: Fix automatic menu creation mem leak")
5b1374b3b3c2fc ("kconfig: Fix expr_free() E_NOT leak")
7cf33f88e29410 ("kconfig: Fix choice symbol expression leak")
05cccce580456d ("kconfig: Document automatic submenu creation code")
0735f7e5def2ab ("kconfig: Document important expression functions")
df60f4b92d3d0b ("kconfig: Remove menu_end_entry()")
b92d804a51796b ("kconfig: drop 'boolean' keyword")
6479f327dea60d ("kconfig: Warn if there is more than one help text")
52e58a3caeba5d ("kconfig: make input_mode static")
5a3dc717b3c785 ("kconfig: make xfgets() really static")
84dd95d4f87a0d ("kconfig: make conf_unsaved a local variable of conf_read()")
765f4cdef6f80d ("kconfig: use default 'yy' prefix for lexer and parser")
eea199b445f64c ("kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX")
e71de5ee08dcb0 ("kbuild: remove remaining use of undefined YACC_PREFIX")
d59fbbd09d5d6b ! ("kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)")
3e41ba05b6d60c ("kconfig: Document SYMBOL_OPTIONAL logic")
d3465af60f4471 ("kconfig: Clarify choice dependency propagation")
9d1a9e8bc18bea ("kconfig: Document 'if' flattening logic")
b53688014e3325 ("kconfig: Clarify menu and 'if' dependency propagation")
d0fd0428ecf04b ("kconfig: fix make xconfig when gettext is missing")
312ee68752faaa ("kconfig: announce removal of oldnoconfig if used")
1ccb27143360bd ("kconfig: make "Selected by:" and "Implied by:" readable")
cedd55d49dee94 ! ("kconfig: Remove silentoldconfig from help and docs; fix kconfig/conf's help")
1b9eda2e4892cb ("kconfig: Warn if help text is blank")
cb67ab2cd2b8ab ("kconfig: do not write choice values when their dependency becomes n")
4f208f392103e8 ("kconfig: show '?' prompt even if no help text is available")
cd58a91def2acc ("kconfig: remove 'config*' pattern from .gitignnore")
d2a04648a5dbc3 ("kconfig: remove check_stdin()")
f3ff6fb5db68bc ("kconfig: echo stdin to stdout if either is redirected")
9e3e10c725360b ("kconfig: send error messages to stderr")
d717f24d8c6808 ("kconfig: add xrealloc() helper")
523ca58b7db2e3 ("kconfig: remove const qualifier from sym_expand_string_value()")
cd81fc82b93fa4 ("kconfig: add xstrdup() helper")
f4bc1eefc1608e ("kconfig: set SYMBOL_AUTO to the symbol marked with defconfig_list")
bf0bbdcf100322 ("kconfig: Don't leak choice names during parsing")
1a90ce36c6eff6 ("kconfig: Update ncurses package names for menuconfig")
5ae6fcc4bb82bd ("kconfig: fix line number in recursive inclusion error message")
07a422bb213adb ! ("kbuild: restore autoksyms.h touch to the top Makefile")
9a47ceec543bfb ("kconfig: clean-up reverse dependency help implementation")
d9119b5925a03b ("kconfig: Print reverse dependencies in groups")
f467c5640c29ad ("kconfig: only write '# CONFIG_FOO is not set' for visible symbols")
59a80b5e892dde ("kconfig: do not call check_conf() for olddefconfig")
4bb3a5b085cd6f ("kconfig: remove unneeded input_mode test in conf()")
99f0b6578bab44 ("kconfig: remove redundant input_mode test for check_conf() loop")
2aad9b89621386 ("kconfig: hide irrelevant sub-menus for oldconfig")
81d2bc2273052e ("kconfig: invoke oldconfig instead of silentoldconfig from local*config")
911a91c39cabcb ! ("kconfig: rename silentoldconfig to syncconfig")
2a61625835c7c8 ! ("kconfig: remove redundant streamline_config.pl prerequisite")
022a4bf6b59dfd ("kconfig: tests: add framework for Kconfig unit testing")
1903c511905984 ("kconfig: tests: add basic choice tests")
49ac3c0c3aa3b7 ("kconfig: tests: test automatic submenu creation")
b76960c0f6b25d ("kconfig: tests: test if new symbols in choice are asked")
930c429a656fdb ("kconfig: tests: check unneeded "is not set" with unmet dependency")
ee236610653ede ("kconfig: tests: check visibility of tristate choice values in y choice")
beaaddb625400e ("kconfig: tests: test defconfig when two choices interact")
3e4888c2e3d77d ("kconfig: tests: test randconfig for choice in choice")
29c434f367ea7b ("kconfig: tests: test if recursive dependencies are detected")
e2c75e7667c737 ("kconfig: tests: test if recursive inclusion is detected")
f622f827958162 ("kconfig: warn unmet direct dependency of tristate symbols selected by y")
f8f69dc0b4e070 ("kconfig: make unmet dependency warnings readable")
26561514cc9def ("kconfig: do not include both curses.h and ncurses.h for nconfig")
32a94b8b0c3e5a ("kconfig: remove duplicated file name and lineno of recursive inclusion")
379a8eb8eb1a55 ("kconfig: detect recursive inclusion earlier")
18492685e479fd ("kconfig: use yylineno option instead of manual lineno increments")
59889300274569 ! (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore")
9a8dfb394c0467 ! ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile")
833e622459432e ! ("genksyms: generate lexer and parser during build instead of shipping")
b23d1a241f4eb4 ! ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically")
17baab68d337a0 ("kconfig: extend output of 'listnewconfig'")
e9781b52d4e0e3 ! ("kbuild: add PYTHON2 and PYTHON3 variables")
The current Kconfig update generates below build-time warnings:
YACC scripts/dtc/dtc-parser.tab.h
scripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
YACC scripts/dtc/dtc-parser.tab.c
scripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
This seems to happen because the Kbuild updates apparently didn't make
room for both "*shipped"-based builds and flex/bison-based builds. A
similar problem has been reported for genksyms parser in v4.17-rc1
commit 833e622459432e ("genksyms: generate lexer and parser during build
instead of shipping"). I have figured out empirically that the warnings
are healed after updating the in-tree U-boot DTC to upstream v1.4.6-9,
same as done by Linux v4.17-rc1 commit 9130ba88464032 ("scripts/dtc:
Update to upstream version v1.4.6-9-gaadd0b65c987"). Whether fixing the
DTC-related yacc warnings should be done together with the Kconfig
re-sync, I would like to hear from community.
My testing was limited to:
- make defconfig all
- make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- r8a7795_ulcb_defconfig all
- comparing .config before and after the re-sync
- running the newly imported Kconfig unit tests as seen below:
$ make testconfig
Tested-by: Petr Vorel <petr.vorel@gmail.com>
============================= test session starts =============================
scripts/kconfig/tests/auto_submenu/__init__.py::test PASSED [ 7%]
scripts/kconfig/tests/choice/__init__.py::test_oldask0 PASSED [ 14%]
scripts/kconfig/tests/choice/__init__.py::test_oldask1 PASSED [ 21%]
scripts/kconfig/tests/choice/__init__.py::test_allyes PASSED [ 28%]
scripts/kconfig/tests/choice/__init__.py::test_allmod PASSED [ 35%]
scripts/kconfig/tests/choice/__init__.py::test_allno PASSED [ 42%]
scripts/kconfig/tests/choice/__init__.py::test_alldef PASSED [ 50%]
scripts/kconfig/tests/choice_value_with_m_dep/__init__.py::test PASSED [ 57%]
scripts/kconfig/tests/err_recursive_inc/__init__.py::test PASSED [ 64%]
scripts/kconfig/tests/inter_choice/__init__.py::test PASSED [ 71%]
scripts/kconfig/tests/new_choice_with_dep/__init__.py::test PASSED [ 78%]
scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py::test PASSED [ 85%]
scripts/kconfig/tests/rand_nested_choice/__init__.py::test PASSED [ 92%]
scripts/kconfig/tests/warn_recursive_dep/__init__.py::test PASSED [100%]
========================== 14 passed in 0.34 seconds ==========================
Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Petr Vorel <petr.vorel@gmail.com>
2018-05-19 12:13:50 +00:00
|
|
|
int conf_unsaved = 0;
|
2014-07-30 05:08:13 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
sym_set_change_count(0);
|
|
|
|
|
2017-02-11 03:39:54 +00:00
|
|
|
if (conf_read_simple(name, S_DEF_USER)) {
|
|
|
|
sym_calc_value(modules_sym);
|
2014-07-30 05:08:13 +00:00
|
|
|
return 1;
|
2017-02-11 03:39:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
sym_calc_value(modules_sym);
|
2014-07-30 05:08:13 +00:00
|
|
|
|
|
|
|
for_all_symbols(i, sym) {
|
|
|
|
sym_calc_value(sym);
|
2020-03-27 15:46:27 +00:00
|
|
|
if (sym_is_choice(sym) || (sym->flags & SYMBOL_NO_WRITE))
|
2014-07-30 05:08:13 +00:00
|
|
|
continue;
|
|
|
|
if (sym_has_value(sym) && (sym->flags & SYMBOL_WRITE)) {
|
|
|
|
/* check that calculated value agrees with saved value */
|
|
|
|
switch (sym->type) {
|
|
|
|
case S_BOOLEAN:
|
|
|
|
case S_TRISTATE:
|
|
|
|
if (sym->def[S_DEF_USER].tri != sym_get_tristate_value(sym))
|
|
|
|
break;
|
|
|
|
if (!sym_is_choice(sym))
|
|
|
|
continue;
|
|
|
|
/* fall through */
|
|
|
|
default:
|
|
|
|
if (!strcmp(sym->curr.val, sym->def[S_DEF_USER].val))
|
|
|
|
continue;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else if (!sym_has_value(sym) && !(sym->flags & SYMBOL_WRITE))
|
|
|
|
/* no previous value and not saved */
|
|
|
|
continue;
|
|
|
|
conf_unsaved++;
|
|
|
|
/* maybe print value in verbose mode... */
|
|
|
|
}
|
|
|
|
|
|
|
|
for_all_symbols(i, sym) {
|
|
|
|
if (sym_has_value(sym) && !sym_is_choice_value(sym)) {
|
|
|
|
/* Reset values of generates values, so they'll appear
|
|
|
|
* as new, if they should become visible, but that
|
|
|
|
* doesn't quite work if the Kconfig and the saved
|
|
|
|
* configuration disagree.
|
|
|
|
*/
|
|
|
|
if (sym->visible == no && !conf_unsaved)
|
|
|
|
sym->flags &= ~SYMBOL_DEF_USER;
|
|
|
|
switch (sym->type) {
|
|
|
|
case S_STRING:
|
|
|
|
case S_INT:
|
|
|
|
case S_HEX:
|
|
|
|
/* Reset a string value if it's out of range */
|
|
|
|
if (sym_string_within_range(sym, sym->def[S_DEF_USER].val))
|
|
|
|
break;
|
|
|
|
sym->flags &= ~(SYMBOL_VALID|SYMBOL_DEF_USER);
|
|
|
|
conf_unsaved++;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
sym_add_change_count(conf_warnings || conf_unsaved);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Kconfig configuration printer
|
|
|
|
*
|
|
|
|
* This printer is used when generating the resulting configuration after
|
|
|
|
* kconfig invocation and `defconfig' files. Unset symbol might be omitted by
|
|
|
|
* passing a non-NULL argument to the printer.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
kconfig_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
|
|
|
|
{
|
|
|
|
|
|
|
|
switch (sym->type) {
|
|
|
|
case S_BOOLEAN:
|
|
|
|
case S_TRISTATE:
|
|
|
|
if (*value == 'n') {
|
|
|
|
bool skip_unset = (arg != NULL);
|
|
|
|
|
|
|
|
if (!skip_unset)
|
|
|
|
fprintf(fp, "# %s%s is not set\n",
|
|
|
|
CONFIG_, sym->name);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(fp, "%s%s=%s\n", CONFIG_, sym->name, value);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
kconfig_print_comment(FILE *fp, const char *value, void *arg)
|
|
|
|
{
|
|
|
|
const char *p = value;
|
|
|
|
size_t l;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
l = strcspn(p, "\n");
|
|
|
|
fprintf(fp, "#");
|
|
|
|
if (l) {
|
|
|
|
fprintf(fp, " ");
|
|
|
|
xfwrite(p, l, 1, fp);
|
|
|
|
p += l;
|
|
|
|
}
|
|
|
|
fprintf(fp, "\n");
|
|
|
|
if (*p++ == '\0')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct conf_printer kconfig_printer_cb =
|
|
|
|
{
|
|
|
|
.print_symbol = kconfig_print_symbol,
|
|
|
|
.print_comment = kconfig_print_comment,
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Header printer
|
|
|
|
*
|
|
|
|
* This printer is used when generating the `include/generated/autoconf.h' file.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
header_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
|
|
|
|
{
|
|
|
|
|
|
|
|
switch (sym->type) {
|
|
|
|
case S_BOOLEAN:
|
|
|
|
case S_TRISTATE: {
|
|
|
|
const char *suffix = "";
|
|
|
|
|
|
|
|
switch (*value) {
|
|
|
|
case 'n':
|
|
|
|
break;
|
|
|
|
case 'm':
|
|
|
|
suffix = "_MODULE";
|
|
|
|
/* fall through */
|
|
|
|
default:
|
|
|
|
fprintf(fp, "#define %s%s%s 1\n",
|
|
|
|
CONFIG_, sym->name, suffix);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case S_HEX: {
|
|
|
|
const char *prefix = "";
|
|
|
|
|
|
|
|
if (value[0] != '0' || (value[1] != 'x' && value[1] != 'X'))
|
|
|
|
prefix = "0x";
|
|
|
|
fprintf(fp, "#define %s%s %s%s\n",
|
|
|
|
CONFIG_, sym->name, prefix, value);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case S_STRING:
|
|
|
|
case S_INT:
|
|
|
|
fprintf(fp, "#define %s%s %s\n",
|
|
|
|
CONFIG_, sym->name, value);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
header_print_comment(FILE *fp, const char *value, void *arg)
|
|
|
|
{
|
|
|
|
const char *p = value;
|
|
|
|
size_t l;
|
|
|
|
|
|
|
|
fprintf(fp, "/*\n");
|
|
|
|
for (;;) {
|
|
|
|
l = strcspn(p, "\n");
|
|
|
|
fprintf(fp, " *");
|
|
|
|
if (l) {
|
|
|
|
fprintf(fp, " ");
|
|
|
|
xfwrite(p, l, 1, fp);
|
|
|
|
p += l;
|
|
|
|
}
|
|
|
|
fprintf(fp, "\n");
|
|
|
|
if (*p++ == '\0')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
fprintf(fp, " */\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct conf_printer header_printer_cb =
|
|
|
|
{
|
|
|
|
.print_symbol = header_print_symbol,
|
|
|
|
.print_comment = header_print_comment,
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Tristate printer
|
|
|
|
*
|
|
|
|
* This printer is used when generating the `include/config/tristate.conf' file.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
tristate_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (sym->type == S_TRISTATE && *value != 'n')
|
|
|
|
fprintf(fp, "%s%s=%c\n", CONFIG_, sym->name, (char)toupper(*value));
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct conf_printer tristate_printer_cb =
|
|
|
|
{
|
|
|
|
.print_symbol = tristate_print_symbol,
|
|
|
|
.print_comment = kconfig_print_comment,
|
|
|
|
};
|
|
|
|
|
|
|
|
static void conf_write_symbol(FILE *fp, struct symbol *sym,
|
|
|
|
struct conf_printer *printer, void *printer_arg)
|
|
|
|
{
|
|
|
|
const char *str;
|
2015-05-29 09:47:32 +00:00
|
|
|
char *str2;
|
2014-07-30 05:08:13 +00:00
|
|
|
|
|
|
|
switch (sym->type) {
|
|
|
|
case S_OTHER:
|
|
|
|
case S_UNKNOWN:
|
|
|
|
break;
|
|
|
|
case S_STRING:
|
|
|
|
str = sym_get_string_value(sym);
|
2015-05-29 09:47:32 +00:00
|
|
|
str2 = xmalloc(strlen(str) + 3);
|
|
|
|
sprintf(str2, "\"%s\"", str);
|
|
|
|
printer->print_symbol(fp, sym, str2, printer_arg);
|
|
|
|
free((void *)str2);
|
2014-07-30 05:08:13 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
str = sym_get_string_value(sym);
|
|
|
|
printer->print_symbol(fp, sym, str, printer_arg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
conf_write_heading(FILE *fp, struct conf_printer *printer, void *printer_arg)
|
|
|
|
{
|
|
|
|
char buf[256];
|
|
|
|
|
|
|
|
snprintf(buf, sizeof(buf),
|
|
|
|
"\n"
|
|
|
|
"Automatically generated file; DO NOT EDIT.\n"
|
|
|
|
"%s\n",
|
|
|
|
rootmenu.prompt->text);
|
|
|
|
|
|
|
|
printer->print_comment(fp, buf, printer_arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Write out a minimal config.
|
|
|
|
* All values that has default values are skipped as this is redundant.
|
|
|
|
*/
|
|
|
|
int conf_write_defconfig(const char *filename)
|
|
|
|
{
|
|
|
|
struct symbol *sym;
|
|
|
|
struct menu *menu;
|
|
|
|
FILE *out;
|
|
|
|
|
|
|
|
out = fopen(filename, "w");
|
|
|
|
if (!out)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
sym_clear_all_valid();
|
|
|
|
|
|
|
|
/* Traverse all menus to find all relevant symbols */
|
|
|
|
menu = rootmenu.list;
|
|
|
|
|
|
|
|
while (menu != NULL)
|
|
|
|
{
|
|
|
|
sym = menu->sym;
|
|
|
|
if (sym == NULL) {
|
|
|
|
if (!menu_is_visible(menu))
|
|
|
|
goto next_menu;
|
|
|
|
} else if (!sym_is_choice(sym)) {
|
|
|
|
sym_calc_value(sym);
|
|
|
|
if (!(sym->flags & SYMBOL_WRITE))
|
|
|
|
goto next_menu;
|
|
|
|
sym->flags &= ~SYMBOL_WRITE;
|
|
|
|
/* If we cannot change the symbol - skip */
|
|
|
|
if (!sym_is_changable(sym))
|
|
|
|
goto next_menu;
|
|
|
|
/* If symbol equals to default value - skip */
|
|
|
|
if (strcmp(sym_get_string_value(sym), sym_get_string_default(sym)) == 0)
|
|
|
|
goto next_menu;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If symbol is a choice value and equals to the
|
|
|
|
* default for a choice - skip.
|
|
|
|
* But only if value is bool and equal to "y" and
|
|
|
|
* choice is not "optional".
|
|
|
|
* (If choice is "optional" then all values can be "n")
|
|
|
|
*/
|
|
|
|
if (sym_is_choice_value(sym)) {
|
|
|
|
struct symbol *cs;
|
|
|
|
struct symbol *ds;
|
|
|
|
|
|
|
|
cs = prop_get_symbol(sym_get_choice_prop(sym));
|
|
|
|
ds = sym_choice_default(cs);
|
|
|
|
if (!sym_is_optional(cs) && sym == ds) {
|
|
|
|
if ((sym->type == S_BOOLEAN) &&
|
|
|
|
sym_get_tristate_value(sym) == yes)
|
|
|
|
goto next_menu;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
conf_write_symbol(out, sym, &kconfig_printer_cb, NULL);
|
|
|
|
}
|
|
|
|
next_menu:
|
|
|
|
if (menu->list != NULL) {
|
|
|
|
menu = menu->list;
|
|
|
|
}
|
|
|
|
else if (menu->next != NULL) {
|
|
|
|
menu = menu->next;
|
|
|
|
} else {
|
|
|
|
while ((menu = menu->parent)) {
|
|
|
|
if (menu->next != NULL) {
|
|
|
|
menu = menu->next;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fclose(out);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int conf_write(const char *name)
|
|
|
|
{
|
|
|
|
FILE *out;
|
|
|
|
struct symbol *sym;
|
|
|
|
struct menu *menu;
|
|
|
|
const char *basename;
|
|
|
|
const char *str;
|
kconfig: Avoid format overflow warning from GCC 8.1
cherry-pick kernel commit 2ae89c7 (2018-06-05)
to avoid warnings when compiling with GCC 8.1
In file included from scripts/kconfig/zconf.tab.c:2486:
scripts/kconfig/confdata.c: In function ‘conf_write’:
scripts/kconfig/confdata.c:771:22: warning: ‘%s’ directive writing likely 7 or more bytes into a region of size between 1 and 4097 [-Wformat-overflow=]
sprintf(newname, "%s%s", dirname, basename);
^~
scripts/kconfig/confdata.c:771:19: note: assuming directive output of 7 bytes
sprintf(newname, "%s%s", dirname, basename);
^~~~~~
scripts/kconfig/confdata.c:771:2: note: ‘sprintf’ output 1 or more bytes (assuming 4104) into a destination of size 4097
sprintf(newname, "%s%s", dirname, basename);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
scripts/kconfig/confdata.c:774:23: warning: ‘.tmpconfig.’ directive writing 11 bytes into a region of size between 1 and 4097 [-Wformat-overflow=]
sprintf(tmpname, "%s.tmpconfig.%d", dirname, (int)getpid());
^~~~~~~~~~~
scripts/kconfig/confdata.c:774:3: note: ‘sprintf’ output between 13 and 4119 bytes into a destination of size 4097
sprintf(tmpname, "%s.tmpconfig.%d", dirname, (int)getpid());
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Luis Araneda <luaraneda@gmail.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-05 20:55:31 +00:00
|
|
|
char dirname[PATH_MAX+1], tmpname[PATH_MAX+22], newname[PATH_MAX+8];
|
2014-07-30 05:08:13 +00:00
|
|
|
char *env;
|
|
|
|
|
|
|
|
dirname[0] = 0;
|
|
|
|
if (name && name[0]) {
|
|
|
|
char *slash;
|
|
|
|
|
2020-03-27 15:46:27 +00:00
|
|
|
if (is_dir(name)) {
|
2014-07-30 05:08:13 +00:00
|
|
|
strcpy(dirname, name);
|
|
|
|
strcat(dirname, "/");
|
|
|
|
basename = conf_get_configname();
|
|
|
|
} else if ((slash = strrchr(name, '/'))) {
|
|
|
|
int size = slash - name + 1;
|
|
|
|
memcpy(dirname, name, size);
|
|
|
|
dirname[size] = 0;
|
|
|
|
if (slash[1])
|
|
|
|
basename = slash + 1;
|
|
|
|
else
|
|
|
|
basename = conf_get_configname();
|
|
|
|
} else
|
|
|
|
basename = name;
|
|
|
|
} else
|
|
|
|
basename = conf_get_configname();
|
|
|
|
|
|
|
|
sprintf(newname, "%s%s", dirname, basename);
|
|
|
|
env = getenv("KCONFIG_OVERWRITECONFIG");
|
|
|
|
if (!env || !*env) {
|
|
|
|
sprintf(tmpname, "%s.tmpconfig.%d", dirname, (int)getpid());
|
|
|
|
out = fopen(tmpname, "w");
|
|
|
|
} else {
|
|
|
|
*tmpname = 0;
|
|
|
|
out = fopen(newname, "w");
|
|
|
|
}
|
|
|
|
if (!out)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
conf_write_heading(out, &kconfig_printer_cb, NULL);
|
|
|
|
|
|
|
|
if (!conf_get_changed())
|
|
|
|
sym_clear_all_valid();
|
|
|
|
|
|
|
|
menu = rootmenu.list;
|
|
|
|
while (menu) {
|
|
|
|
sym = menu->sym;
|
|
|
|
if (!sym) {
|
|
|
|
if (!menu_is_visible(menu))
|
|
|
|
goto next;
|
|
|
|
str = menu_get_prompt(menu);
|
|
|
|
fprintf(out, "\n"
|
|
|
|
"#\n"
|
|
|
|
"# %s\n"
|
|
|
|
"#\n", str);
|
|
|
|
} else if (!(sym->flags & SYMBOL_CHOICE)) {
|
|
|
|
sym_calc_value(sym);
|
|
|
|
if (!(sym->flags & SYMBOL_WRITE))
|
|
|
|
goto next;
|
|
|
|
sym->flags &= ~SYMBOL_WRITE;
|
|
|
|
|
|
|
|
conf_write_symbol(out, sym, &kconfig_printer_cb, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
next:
|
|
|
|
if (menu->list) {
|
|
|
|
menu = menu->list;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (menu->next)
|
|
|
|
menu = menu->next;
|
|
|
|
else while ((menu = menu->parent)) {
|
|
|
|
if (menu->next) {
|
|
|
|
menu = menu->next;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fclose(out);
|
|
|
|
|
|
|
|
if (*tmpname) {
|
|
|
|
strcat(dirname, basename);
|
|
|
|
strcat(dirname, ".old");
|
|
|
|
rename(newname, dirname);
|
|
|
|
if (rename(tmpname, newname))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2020-03-11 22:11:17 +00:00
|
|
|
conf_message("configuration written to %s", newname);
|
2014-07-30 05:08:13 +00:00
|
|
|
|
|
|
|
sym_set_change_count(0);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2020-03-27 15:46:27 +00:00
|
|
|
/* write a dependency file as used by kbuild to track dependencies */
|
|
|
|
static int conf_write_dep(const char *name)
|
|
|
|
{
|
|
|
|
struct file *file;
|
|
|
|
FILE *out;
|
|
|
|
|
|
|
|
if (!name)
|
|
|
|
name = ".kconfig.d";
|
|
|
|
out = fopen("..config.tmp", "w");
|
|
|
|
if (!out)
|
|
|
|
return 1;
|
|
|
|
fprintf(out, "deps_config := \\\n");
|
|
|
|
for (file = file_list; file; file = file->next) {
|
|
|
|
if (file->next)
|
|
|
|
fprintf(out, "\t%s \\\n", file->name);
|
|
|
|
else
|
|
|
|
fprintf(out, "\t%s\n", file->name);
|
|
|
|
}
|
|
|
|
fprintf(out, "\n%s: \\\n"
|
|
|
|
"\t$(deps_config)\n\n", conf_get_autoconfig_name());
|
|
|
|
|
|
|
|
env_write_dep(out, conf_get_autoconfig_name());
|
|
|
|
|
|
|
|
fprintf(out, "\n$(deps_config): ;\n");
|
|
|
|
fclose(out);
|
|
|
|
|
|
|
|
if (make_parent_dir(name))
|
|
|
|
return 1;
|
|
|
|
rename("..config.tmp", name);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-07-30 05:08:13 +00:00
|
|
|
static int conf_split_config(void)
|
|
|
|
{
|
|
|
|
const char *name;
|
|
|
|
char path[PATH_MAX+1];
|
|
|
|
char *s, *d, c;
|
|
|
|
struct symbol *sym;
|
|
|
|
int res, i, fd;
|
|
|
|
|
|
|
|
name = conf_get_autoconfig_name();
|
|
|
|
conf_read_simple(name, S_DEF_AUTO);
|
2017-02-11 03:39:54 +00:00
|
|
|
sym_calc_value(modules_sym);
|
2014-07-30 05:08:13 +00:00
|
|
|
|
2020-03-27 15:46:27 +00:00
|
|
|
if (make_parent_dir("include/config/foo.h"))
|
|
|
|
return 1;
|
2014-07-30 05:08:13 +00:00
|
|
|
if (chdir("include/config"))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
res = 0;
|
|
|
|
for_all_symbols(i, sym) {
|
|
|
|
sym_calc_value(sym);
|
2020-03-27 15:46:27 +00:00
|
|
|
if ((sym->flags & SYMBOL_NO_WRITE) || !sym->name)
|
2014-07-30 05:08:13 +00:00
|
|
|
continue;
|
|
|
|
if (sym->flags & SYMBOL_WRITE) {
|
|
|
|
if (sym->flags & SYMBOL_DEF_AUTO) {
|
|
|
|
/*
|
|
|
|
* symbol has old and new value,
|
|
|
|
* so compare them...
|
|
|
|
*/
|
|
|
|
switch (sym->type) {
|
|
|
|
case S_BOOLEAN:
|
|
|
|
case S_TRISTATE:
|
|
|
|
if (sym_get_tristate_value(sym) ==
|
|
|
|
sym->def[S_DEF_AUTO].tri)
|
|
|
|
continue;
|
|
|
|
break;
|
|
|
|
case S_STRING:
|
|
|
|
case S_HEX:
|
|
|
|
case S_INT:
|
|
|
|
if (!strcmp(sym_get_string_value(sym),
|
|
|
|
sym->def[S_DEF_AUTO].val))
|
|
|
|
continue;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* If there is no old value, only 'no' (unset)
|
|
|
|
* is allowed as new value.
|
|
|
|
*/
|
|
|
|
switch (sym->type) {
|
|
|
|
case S_BOOLEAN:
|
|
|
|
case S_TRISTATE:
|
|
|
|
if (sym_get_tristate_value(sym) == no)
|
|
|
|
continue;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (!(sym->flags & SYMBOL_DEF_AUTO))
|
|
|
|
/* There is neither an old nor a new value. */
|
|
|
|
continue;
|
|
|
|
/* else
|
|
|
|
* There is an old value, but no new value ('no' (unset)
|
|
|
|
* isn't saved in auto.conf, so the old value is always
|
|
|
|
* different from 'no').
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Replace all '_' and append ".h" */
|
|
|
|
s = sym->name;
|
|
|
|
d = path;
|
|
|
|
while ((c = *s++)) {
|
|
|
|
c = tolower(c);
|
|
|
|
*d++ = (c == '_') ? '/' : c;
|
|
|
|
}
|
|
|
|
strcpy(d, ".h");
|
|
|
|
|
|
|
|
/* Assume directory path already exists. */
|
|
|
|
fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
|
|
|
|
if (fd == -1) {
|
|
|
|
if (errno != ENOENT) {
|
|
|
|
res = 1;
|
|
|
|
break;
|
|
|
|
}
|
2020-03-27 15:46:27 +00:00
|
|
|
|
|
|
|
if (make_parent_dir(path)) {
|
|
|
|
res = 1;
|
|
|
|
goto out;
|
2014-07-30 05:08:13 +00:00
|
|
|
}
|
2020-03-27 15:46:27 +00:00
|
|
|
|
2014-07-30 05:08:13 +00:00
|
|
|
/* Try it again. */
|
|
|
|
fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
|
|
|
|
if (fd == -1) {
|
|
|
|
res = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
close(fd);
|
|
|
|
}
|
|
|
|
out:
|
|
|
|
if (chdir("../.."))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
int conf_write_autoconf(void)
|
|
|
|
{
|
|
|
|
struct symbol *sym;
|
|
|
|
const char *name;
|
|
|
|
FILE *out, *tristate, *out_h;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
sym_clear_all_valid();
|
|
|
|
|
2020-03-27 15:46:27 +00:00
|
|
|
conf_write_dep("include/config/auto.conf.cmd");
|
2014-07-30 05:08:13 +00:00
|
|
|
|
|
|
|
if (conf_split_config())
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
out = fopen(".tmpconfig", "w");
|
|
|
|
if (!out)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
tristate = fopen(".tmpconfig_tristate", "w");
|
|
|
|
if (!tristate) {
|
|
|
|
fclose(out);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
out_h = fopen(".tmpconfig.h", "w");
|
|
|
|
if (!out_h) {
|
|
|
|
fclose(out);
|
|
|
|
fclose(tristate);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
conf_write_heading(out, &kconfig_printer_cb, NULL);
|
|
|
|
|
|
|
|
conf_write_heading(tristate, &tristate_printer_cb, NULL);
|
|
|
|
|
|
|
|
conf_write_heading(out_h, &header_printer_cb, NULL);
|
|
|
|
|
|
|
|
for_all_symbols(i, sym) {
|
|
|
|
sym_calc_value(sym);
|
|
|
|
if (!(sym->flags & SYMBOL_WRITE) || !sym->name)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* write symbol to auto.conf, tristate and header files */
|
|
|
|
conf_write_symbol(out, sym, &kconfig_printer_cb, (void *)1);
|
|
|
|
|
|
|
|
conf_write_symbol(tristate, sym, &tristate_printer_cb, (void *)1);
|
|
|
|
|
|
|
|
conf_write_symbol(out_h, sym, &header_printer_cb, NULL);
|
|
|
|
}
|
|
|
|
fclose(out);
|
|
|
|
fclose(tristate);
|
|
|
|
fclose(out_h);
|
|
|
|
|
|
|
|
name = getenv("KCONFIG_AUTOHEADER");
|
|
|
|
if (!name)
|
|
|
|
name = "include/generated/autoconf.h";
|
2020-03-27 15:46:27 +00:00
|
|
|
if (make_parent_dir(name))
|
|
|
|
return 1;
|
2014-07-30 05:08:13 +00:00
|
|
|
if (rename(".tmpconfig.h", name))
|
|
|
|
return 1;
|
2020-03-27 15:46:27 +00:00
|
|
|
|
2014-07-30 05:08:13 +00:00
|
|
|
name = getenv("KCONFIG_TRISTATE");
|
|
|
|
if (!name)
|
|
|
|
name = "include/config/tristate.conf";
|
2020-03-27 15:46:27 +00:00
|
|
|
if (make_parent_dir(name))
|
|
|
|
return 1;
|
2014-07-30 05:08:13 +00:00
|
|
|
if (rename(".tmpconfig_tristate", name))
|
|
|
|
return 1;
|
2020-03-27 15:46:27 +00:00
|
|
|
|
2014-07-30 05:08:13 +00:00
|
|
|
name = conf_get_autoconfig_name();
|
2020-03-27 15:46:27 +00:00
|
|
|
if (make_parent_dir(name))
|
|
|
|
return 1;
|
2014-07-30 05:08:13 +00:00
|
|
|
/*
|
|
|
|
* This must be the last step, kbuild has a dependency on auto.conf
|
|
|
|
* and this marks the successful completion of the previous steps.
|
|
|
|
*/
|
|
|
|
if (rename(".tmpconfig", name))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int sym_change_count;
|
|
|
|
static void (*conf_changed_callback)(void);
|
|
|
|
|
|
|
|
void sym_set_change_count(int count)
|
|
|
|
{
|
|
|
|
int _sym_change_count = sym_change_count;
|
|
|
|
sym_change_count = count;
|
|
|
|
if (conf_changed_callback &&
|
|
|
|
(bool)_sym_change_count != (bool)count)
|
|
|
|
conf_changed_callback();
|
|
|
|
}
|
|
|
|
|
|
|
|
void sym_add_change_count(int count)
|
|
|
|
{
|
|
|
|
sym_set_change_count(count + sym_change_count);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool conf_get_changed(void)
|
|
|
|
{
|
|
|
|
return sym_change_count;
|
|
|
|
}
|
|
|
|
|
|
|
|
void conf_set_changed_callback(void (*fn)(void))
|
|
|
|
{
|
|
|
|
conf_changed_callback = fn;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool randomize_choice_values(struct symbol *csym)
|
|
|
|
{
|
|
|
|
struct property *prop;
|
|
|
|
struct symbol *sym;
|
|
|
|
struct expr *e;
|
|
|
|
int cnt, def;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If choice is mod then we may have more items selected
|
|
|
|
* and if no then no-one.
|
|
|
|
* In both cases stop.
|
|
|
|
*/
|
|
|
|
if (csym->curr.tri != yes)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
prop = sym_get_choice_prop(csym);
|
|
|
|
|
|
|
|
/* count entries in choice block */
|
|
|
|
cnt = 0;
|
|
|
|
expr_list_for_each_sym(prop->expr, e, sym)
|
|
|
|
cnt++;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* find a random value and set it to yes,
|
|
|
|
* set the rest to no so we have only one set
|
|
|
|
*/
|
|
|
|
def = (rand() % cnt);
|
|
|
|
|
|
|
|
cnt = 0;
|
|
|
|
expr_list_for_each_sym(prop->expr, e, sym) {
|
|
|
|
if (def == cnt++) {
|
|
|
|
sym->def[S_DEF_USER].tri = yes;
|
|
|
|
csym->def[S_DEF_USER].val = sym;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
sym->def[S_DEF_USER].tri = no;
|
|
|
|
}
|
|
|
|
sym->flags |= SYMBOL_DEF_USER;
|
|
|
|
/* clear VALID to get value calculated */
|
|
|
|
sym->flags &= ~SYMBOL_VALID;
|
|
|
|
}
|
|
|
|
csym->flags |= SYMBOL_DEF_USER;
|
|
|
|
/* clear VALID to get value calculated */
|
|
|
|
csym->flags &= ~(SYMBOL_VALID);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void set_all_choice_values(struct symbol *csym)
|
|
|
|
{
|
|
|
|
struct property *prop;
|
|
|
|
struct symbol *sym;
|
|
|
|
struct expr *e;
|
|
|
|
|
|
|
|
prop = sym_get_choice_prop(csym);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set all non-assinged choice values to no
|
|
|
|
*/
|
|
|
|
expr_list_for_each_sym(prop->expr, e, sym) {
|
|
|
|
if (!sym_has_value(sym))
|
|
|
|
sym->def[S_DEF_USER].tri = no;
|
|
|
|
}
|
|
|
|
csym->flags |= SYMBOL_DEF_USER;
|
|
|
|
/* clear VALID to get value calculated */
|
|
|
|
csym->flags &= ~(SYMBOL_VALID | SYMBOL_NEED_SET_CHOICE_VALUES);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool conf_set_all_new_symbols(enum conf_def_mode mode)
|
|
|
|
{
|
|
|
|
struct symbol *sym, *csym;
|
kconfig: re-sync with Linux 4.17-rc4
Align Kconfig to Linux 4.17-rc4 with minimal impact on non-kconfig files.
Previous Kconfig sync was done by commit bf7ab1e70fd762 ("kconfig:
re-sync with Linux 4.10") and it achieved almost perfect alignment with
a few (intended) exceptions, caused by below U-boot commits:
[A] v2015.04 5f9eb2207500 ("kbuild: remove scripts/multiconfig.sh")
[B] v2015.07 20c20826efab ("Kconfig: Enable usage of escape char '\' in string values")
[C] v2016.01 da58dec86616 ("Various Makefiles: Add SPDX-License-Identifier tags")
[D] v2016.03 5b8031ccb4ed ("Add more SPDX-License-Identifier tags")
[E] v2016.03 192bc6948b02 ("Fix GCC format-security errors and convert sprintfs.")
Here is the list of Kconfig commits which followed the v4.10 alignment:
[F] v2018.01 0931ed3c0d0f ("kconfig/symbol.c: use correct pointer type argument for sizeof")
[G] v2018.03 1414e09b4f25 ("kconfig: revert change that was not needed for -Wformat-security")
[H] v2018.05 83d290c56fab ("SPDX: Convert all of our single license tags to Linux Kernel style")
Commit [F] was subsequently applied to Linux kernel as commit [I]
with the same patch id, so it won't contribute to further misalignment.
[I] v4.15-rc1 88127dae6ed9 ("kconfig/symbol.c: use correct pointer type argument for sizeof")
Commit [G] is a Kconfig-specific revert of commit [E].
Commit [H] relocated and reformatted the license doing no functional change.
In summary, the only functional change that makes U-boot Kconfig
diverge from Linux Kconfig is commit [B]. After a brief analysis,
the purpose of [B] seems to be placing "\n" literals in string symbols
like CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n" in order to pass
them directly to printf and expect correct output at runtime. Currently,
Linux doesn't seem to have this requirement, so for the moment [B] looks
like a U-boot specific feature/fix. From point of view of further Kconfig
alignment and backporting efforts, it is highly desired that commits
like [B] are propagated to Linux and any Kconfig fixes/features are
contributed to Linux kernel first. This specific Kconfig re-sync just
keeps [B] in place.
Contrary to 4.10 Kconfig re-sync (which achieves zero non-kconfig
changes), 4.17-rc4 re-sync does some amount of updates in Kbuild
(striving to keep them at minimum), due to a number of reasons:
* Kbuild is affected by the removal of Kconfig "*shipped" files and now
requires flex and bison pre-installed on the host.
* PYTHON{2,3} variables are defined in top-level Makefile as
prerequisite for running the newly developed Kconfig unit tests.
* silentoldconfig becomes an "internal implementation detail" deprecated
for external use, being renamed to syncconfig.
The exact non-kconfig files touched by this commit are:
$ git show --format="" --stat -- ':!scripts/kconfig'
.gitignore | 2 ++
Makefile | 9 +++++++--
scripts/Makefile.build | 11 +++++++++++
scripts/Makefile.lib | 41 ++++++++++++-----------------------------
The imported Linux commits touching the above files are:
c054be10ffdbd5 ("remove gperf left-overs from build system")
73a4f6dbe70a1b ("kbuild: add LEX and YACC variables")
033dba2ec06c47 ("kbuild: prepare to remove C files pre-generated by flex and bison")
eea199b445f64c ("kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX")
e71de5ee08dcb0 ("kbuild: remove remaining use of undefined YACC_PREFIX")
d59fbbd09d5d6b ("kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)")
911a91c39cabcb H ("kconfig: rename silentoldconfig to syncconfig")
59889300274569 (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore")
9a8dfb394c0467 ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile")
833e622459432e H ("genksyms: generate lexer and parser during build instead of shipping")
b23d1a241f4eb4 H ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically")
e9781b52d4e0e3 H ("kbuild: add PYTHON2 and PYTHON3 variables")
The commits marked with 'H' are assessed as "hard" (build will fail)
prerequisites and the rest of them are assessed as "soft" prerequisites
for the re-sync. In spite of relatively high number of non-H commits,
they belong to this Kconfig update topic-wise and decrease the number of
cherry pick conflicts for many commits in this series. Additional effort
can be put in eliminating the soft prerequisites, if really needed.
The commits which contributed to this Kconfig re-sync are listed below.
Whenever a conflict resolution has been performed (mostly by hand, but
sometimes automatically by git), it is revealed by the '!' sign in the
second column, which means a patch id mismatch between Linux and U-boot
commits:
9be3213b14d44f ("gconfig: remove misleading parentheses around a condition")
ff85a1a80e0034 ("kconfig: Check for libncurses before menuconfig")
ad8181060788c8 ("kconfig: fix sparse warnings in nconfig")
cb77f0d623ff33 ! ("scripts: Switch to more portable Perl shebang")
bb3290d91695bb ! ("Remove gperf usage from toolchain")
c054be10ffdbd5 ("remove gperf left-overs from build system")
b24413180f5600 ! ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license")
9059a3493efea6 ! ("kconfig: fix relational operators for bool and tristate symbols")
2c37e08464a850 ("kconfig: Warn if choice default is not in choice")
33ca1a24866373 ("kconfig: Document the 'menu' struct")
52aede4ba5efd1 ("kconfig: Document the 'symbol' struct")
c873443430ebd1 ("kconfig: Sync zconf.y with zconf.tab.c_shipped")
9a826842ff2fbd ("kconfig: Rename menu_check_dep() to rewrite_m()")
fa8cedaef814ce ("kconfig: Clarify expression rewriting")
f77850d3fe0c96 ("kconfig: Clean up modules handling and fix crash")
e3b03bf29d6b99 ("kconfig: display recursive dependency resolution hint just once")
73a4f6dbe70a1b ! ("kbuild: add LEX and YACC variables")
033dba2ec06c47 ! ("kbuild: prepare to remove C files pre-generated by flex and bison")
29c833061c1d8c ("kconfig: generate lexer and parser during build instead of shipping")
26e47a3c11a25c ("kconfig: Don't leak symbol names during parsing")
24161a6711c945 ("kconfig: Don't leak 'source' filenames during parsing")
bc28fe1d5ede88 ("kconfig: Don't leak 'option' arguments during parsing")
0724a7c32a54e3 ("kconfig: Don't leak main menus during parsing")
ae7440ef0c8013 ("kconfig: Fix automatic menu creation mem leak")
5b1374b3b3c2fc ("kconfig: Fix expr_free() E_NOT leak")
7cf33f88e29410 ("kconfig: Fix choice symbol expression leak")
05cccce580456d ("kconfig: Document automatic submenu creation code")
0735f7e5def2ab ("kconfig: Document important expression functions")
df60f4b92d3d0b ("kconfig: Remove menu_end_entry()")
b92d804a51796b ("kconfig: drop 'boolean' keyword")
6479f327dea60d ("kconfig: Warn if there is more than one help text")
52e58a3caeba5d ("kconfig: make input_mode static")
5a3dc717b3c785 ("kconfig: make xfgets() really static")
84dd95d4f87a0d ("kconfig: make conf_unsaved a local variable of conf_read()")
765f4cdef6f80d ("kconfig: use default 'yy' prefix for lexer and parser")
eea199b445f64c ("kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX")
e71de5ee08dcb0 ("kbuild: remove remaining use of undefined YACC_PREFIX")
d59fbbd09d5d6b ! ("kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)")
3e41ba05b6d60c ("kconfig: Document SYMBOL_OPTIONAL logic")
d3465af60f4471 ("kconfig: Clarify choice dependency propagation")
9d1a9e8bc18bea ("kconfig: Document 'if' flattening logic")
b53688014e3325 ("kconfig: Clarify menu and 'if' dependency propagation")
d0fd0428ecf04b ("kconfig: fix make xconfig when gettext is missing")
312ee68752faaa ("kconfig: announce removal of oldnoconfig if used")
1ccb27143360bd ("kconfig: make "Selected by:" and "Implied by:" readable")
cedd55d49dee94 ! ("kconfig: Remove silentoldconfig from help and docs; fix kconfig/conf's help")
1b9eda2e4892cb ("kconfig: Warn if help text is blank")
cb67ab2cd2b8ab ("kconfig: do not write choice values when their dependency becomes n")
4f208f392103e8 ("kconfig: show '?' prompt even if no help text is available")
cd58a91def2acc ("kconfig: remove 'config*' pattern from .gitignnore")
d2a04648a5dbc3 ("kconfig: remove check_stdin()")
f3ff6fb5db68bc ("kconfig: echo stdin to stdout if either is redirected")
9e3e10c725360b ("kconfig: send error messages to stderr")
d717f24d8c6808 ("kconfig: add xrealloc() helper")
523ca58b7db2e3 ("kconfig: remove const qualifier from sym_expand_string_value()")
cd81fc82b93fa4 ("kconfig: add xstrdup() helper")
f4bc1eefc1608e ("kconfig: set SYMBOL_AUTO to the symbol marked with defconfig_list")
bf0bbdcf100322 ("kconfig: Don't leak choice names during parsing")
1a90ce36c6eff6 ("kconfig: Update ncurses package names for menuconfig")
5ae6fcc4bb82bd ("kconfig: fix line number in recursive inclusion error message")
07a422bb213adb ! ("kbuild: restore autoksyms.h touch to the top Makefile")
9a47ceec543bfb ("kconfig: clean-up reverse dependency help implementation")
d9119b5925a03b ("kconfig: Print reverse dependencies in groups")
f467c5640c29ad ("kconfig: only write '# CONFIG_FOO is not set' for visible symbols")
59a80b5e892dde ("kconfig: do not call check_conf() for olddefconfig")
4bb3a5b085cd6f ("kconfig: remove unneeded input_mode test in conf()")
99f0b6578bab44 ("kconfig: remove redundant input_mode test for check_conf() loop")
2aad9b89621386 ("kconfig: hide irrelevant sub-menus for oldconfig")
81d2bc2273052e ("kconfig: invoke oldconfig instead of silentoldconfig from local*config")
911a91c39cabcb ! ("kconfig: rename silentoldconfig to syncconfig")
2a61625835c7c8 ! ("kconfig: remove redundant streamline_config.pl prerequisite")
022a4bf6b59dfd ("kconfig: tests: add framework for Kconfig unit testing")
1903c511905984 ("kconfig: tests: add basic choice tests")
49ac3c0c3aa3b7 ("kconfig: tests: test automatic submenu creation")
b76960c0f6b25d ("kconfig: tests: test if new symbols in choice are asked")
930c429a656fdb ("kconfig: tests: check unneeded "is not set" with unmet dependency")
ee236610653ede ("kconfig: tests: check visibility of tristate choice values in y choice")
beaaddb625400e ("kconfig: tests: test defconfig when two choices interact")
3e4888c2e3d77d ("kconfig: tests: test randconfig for choice in choice")
29c434f367ea7b ("kconfig: tests: test if recursive dependencies are detected")
e2c75e7667c737 ("kconfig: tests: test if recursive inclusion is detected")
f622f827958162 ("kconfig: warn unmet direct dependency of tristate symbols selected by y")
f8f69dc0b4e070 ("kconfig: make unmet dependency warnings readable")
26561514cc9def ("kconfig: do not include both curses.h and ncurses.h for nconfig")
32a94b8b0c3e5a ("kconfig: remove duplicated file name and lineno of recursive inclusion")
379a8eb8eb1a55 ("kconfig: detect recursive inclusion earlier")
18492685e479fd ("kconfig: use yylineno option instead of manual lineno increments")
59889300274569 ! (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore")
9a8dfb394c0467 ! ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile")
833e622459432e ! ("genksyms: generate lexer and parser during build instead of shipping")
b23d1a241f4eb4 ! ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically")
17baab68d337a0 ("kconfig: extend output of 'listnewconfig'")
e9781b52d4e0e3 ! ("kbuild: add PYTHON2 and PYTHON3 variables")
The current Kconfig update generates below build-time warnings:
YACC scripts/dtc/dtc-parser.tab.h
scripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
YACC scripts/dtc/dtc-parser.tab.c
scripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
This seems to happen because the Kbuild updates apparently didn't make
room for both "*shipped"-based builds and flex/bison-based builds. A
similar problem has been reported for genksyms parser in v4.17-rc1
commit 833e622459432e ("genksyms: generate lexer and parser during build
instead of shipping"). I have figured out empirically that the warnings
are healed after updating the in-tree U-boot DTC to upstream v1.4.6-9,
same as done by Linux v4.17-rc1 commit 9130ba88464032 ("scripts/dtc:
Update to upstream version v1.4.6-9-gaadd0b65c987"). Whether fixing the
DTC-related yacc warnings should be done together with the Kconfig
re-sync, I would like to hear from community.
My testing was limited to:
- make defconfig all
- make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- r8a7795_ulcb_defconfig all
- comparing .config before and after the re-sync
- running the newly imported Kconfig unit tests as seen below:
$ make testconfig
Tested-by: Petr Vorel <petr.vorel@gmail.com>
============================= test session starts =============================
scripts/kconfig/tests/auto_submenu/__init__.py::test PASSED [ 7%]
scripts/kconfig/tests/choice/__init__.py::test_oldask0 PASSED [ 14%]
scripts/kconfig/tests/choice/__init__.py::test_oldask1 PASSED [ 21%]
scripts/kconfig/tests/choice/__init__.py::test_allyes PASSED [ 28%]
scripts/kconfig/tests/choice/__init__.py::test_allmod PASSED [ 35%]
scripts/kconfig/tests/choice/__init__.py::test_allno PASSED [ 42%]
scripts/kconfig/tests/choice/__init__.py::test_alldef PASSED [ 50%]
scripts/kconfig/tests/choice_value_with_m_dep/__init__.py::test PASSED [ 57%]
scripts/kconfig/tests/err_recursive_inc/__init__.py::test PASSED [ 64%]
scripts/kconfig/tests/inter_choice/__init__.py::test PASSED [ 71%]
scripts/kconfig/tests/new_choice_with_dep/__init__.py::test PASSED [ 78%]
scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py::test PASSED [ 85%]
scripts/kconfig/tests/rand_nested_choice/__init__.py::test PASSED [ 92%]
scripts/kconfig/tests/warn_recursive_dep/__init__.py::test PASSED [100%]
========================== 14 passed in 0.34 seconds ==========================
Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Petr Vorel <petr.vorel@gmail.com>
2018-05-19 12:13:50 +00:00
|
|
|
int i, cnt, pby, pty, ptm; /* pby: probability of bool = y
|
2014-07-30 05:08:13 +00:00
|
|
|
* pty: probability of tristate = y
|
|
|
|
* ptm: probability of tristate = m
|
|
|
|
*/
|
|
|
|
|
|
|
|
pby = 50; pty = ptm = 33; /* can't go as the default in switch-case
|
|
|
|
* below, otherwise gcc whines about
|
|
|
|
* -Wmaybe-uninitialized */
|
|
|
|
if (mode == def_random) {
|
|
|
|
int n, p[3];
|
|
|
|
char *env = getenv("KCONFIG_PROBABILITY");
|
|
|
|
n = 0;
|
|
|
|
while( env && *env ) {
|
|
|
|
char *endp;
|
|
|
|
int tmp = strtol( env, &endp, 10 );
|
|
|
|
if( tmp >= 0 && tmp <= 100 ) {
|
|
|
|
p[n++] = tmp;
|
|
|
|
} else {
|
|
|
|
errno = ERANGE;
|
|
|
|
perror( "KCONFIG_PROBABILITY" );
|
|
|
|
exit( 1 );
|
|
|
|
}
|
|
|
|
env = (*endp == ':') ? endp+1 : endp;
|
|
|
|
if( n >=3 ) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
switch( n ) {
|
|
|
|
case 1:
|
|
|
|
pby = p[0]; ptm = pby/2; pty = pby-ptm;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
pty = p[0]; ptm = p[1]; pby = pty + ptm;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
pby = p[0]; pty = p[1]; ptm = p[2];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( pty+ptm > 100 ) {
|
|
|
|
errno = ERANGE;
|
|
|
|
perror( "KCONFIG_PROBABILITY" );
|
|
|
|
exit( 1 );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
bool has_changed = false;
|
|
|
|
|
|
|
|
for_all_symbols(i, sym) {
|
|
|
|
if (sym_has_value(sym) || (sym->flags & SYMBOL_VALID))
|
|
|
|
continue;
|
|
|
|
switch (sym_get_type(sym)) {
|
|
|
|
case S_BOOLEAN:
|
|
|
|
case S_TRISTATE:
|
|
|
|
has_changed = true;
|
|
|
|
switch (mode) {
|
|
|
|
case def_yes:
|
|
|
|
sym->def[S_DEF_USER].tri = yes;
|
|
|
|
break;
|
|
|
|
case def_mod:
|
|
|
|
sym->def[S_DEF_USER].tri = mod;
|
|
|
|
break;
|
|
|
|
case def_no:
|
|
|
|
if (sym->flags & SYMBOL_ALLNOCONFIG_Y)
|
|
|
|
sym->def[S_DEF_USER].tri = yes;
|
|
|
|
else
|
|
|
|
sym->def[S_DEF_USER].tri = no;
|
|
|
|
break;
|
|
|
|
case def_random:
|
|
|
|
sym->def[S_DEF_USER].tri = no;
|
|
|
|
cnt = rand() % 100;
|
|
|
|
if (sym->type == S_TRISTATE) {
|
|
|
|
if (cnt < pty)
|
|
|
|
sym->def[S_DEF_USER].tri = yes;
|
|
|
|
else if (cnt < (pty+ptm))
|
|
|
|
sym->def[S_DEF_USER].tri = mod;
|
|
|
|
} else if (cnt < pby)
|
|
|
|
sym->def[S_DEF_USER].tri = yes;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!(sym_is_choice(sym) && mode == def_random))
|
|
|
|
sym->flags |= SYMBOL_DEF_USER;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
sym_clear_all_valid();
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We have different type of choice blocks.
|
|
|
|
* If curr.tri equals to mod then we can select several
|
|
|
|
* choice symbols in one block.
|
|
|
|
* In this case we do nothing.
|
|
|
|
* If curr.tri equals yes then only one symbol can be
|
|
|
|
* selected in a choice block and we set it to yes,
|
|
|
|
* and the rest to no.
|
|
|
|
*/
|
|
|
|
if (mode != def_random) {
|
|
|
|
for_all_symbols(i, csym) {
|
|
|
|
if ((sym_is_choice(csym) && !sym_has_value(csym)) ||
|
|
|
|
sym_is_choice_value(csym))
|
|
|
|
csym->flags |= SYMBOL_NEED_SET_CHOICE_VALUES;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for_all_symbols(i, csym) {
|
|
|
|
if (sym_has_value(csym) || !sym_is_choice(csym))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
sym_calc_value(csym);
|
|
|
|
if (mode == def_random)
|
|
|
|
has_changed = randomize_choice_values(csym);
|
|
|
|
else {
|
|
|
|
set_all_choice_values(csym);
|
|
|
|
has_changed = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return has_changed;
|
|
|
|
}
|