kconfig: re-sync with Linux 4.17-rc4
Subsystems (3)
PATCH v2 1/6 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.hscripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
YACC scripts/dtc/dtc-parser.tab.cscripts/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
============================= 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 ==========================
---
v1->v2:
* Re-picked v4.16-rc1 commit cedd55d49dee ("kconfig: Remove silentoldconfig from help and docs; fix kconfig/conf's help") with correct conflict resolution in scripts/kconfig/Makefile.
* Added: Reviewed-by: Masahiro Yamada <[email protected]
.gitignore | 2 + Makefile | 9 +- scripts/Makefile.build | 11 + scripts/Makefile.lib | 41 +- scripts/kconfig/.gitignore | 5 - scripts/kconfig/Makefile | 51 +- scripts/kconfig/check.sh | 1 + scripts/kconfig/conf.c | 110 +- scripts/kconfig/confdata.c | 10 +- scripts/kconfig/expr.c | 193 +- scripts/kconfig/expr.h | 93 +- scripts/kconfig/gconf.c | 2 +- scripts/kconfig/kconf_id.c | 53 + scripts/kconfig/kxgettext.c | 2 +- scripts/kconfig/list.h | 1 + scripts/kconfig/lkc.h | 6 +- scripts/kconfig/lkc_proto.h | 3 +- scripts/kconfig/lxdialog/check-lxdialog.sh | 4 +- scripts/kconfig/mconf.c | 2 +- scripts/kconfig/menu.c | 195 +- scripts/kconfig/nconf.c | 12 +- scripts/kconfig/nconf.gui.c | 7 +- scripts/kconfig/nconf.h | 4 +- scripts/kconfig/streamline_config.pl | 3 +- scripts/kconfig/symbol.c | 80 +- scripts/kconfig/tests/auto_submenu/Kconfig | 50 + .../kconfig/tests/auto_submenu/__init__.py | 12 + .../tests/auto_submenu/expected_stdout | 10 + scripts/kconfig/tests/choice/Kconfig | 54 + scripts/kconfig/tests/choice/__init__.py | 40 + .../tests/choice/alldef_expected_config | 5 + .../tests/choice/allmod_expected_config | 9 + .../tests/choice/allno_expected_config | 5 + .../tests/choice/allyes_expected_config | 9 + .../tests/choice/oldask0_expected_stdout | 10 + scripts/kconfig/tests/choice/oldask1_config | 2 + .../tests/choice/oldask1_expected_stdout | 15 + .../tests/choice_value_with_m_dep/Kconfig | 19 + .../tests/choice_value_with_m_dep/__init__.py | 15 + .../tests/choice_value_with_m_dep/config | 2 + .../choice_value_with_m_dep/expected_config | 3 + .../choice_value_with_m_dep/expected_stdout | 4 + scripts/kconfig/tests/conftest.py | 291 ++ .../kconfig/tests/err_recursive_inc/Kconfig | 1 + .../tests/err_recursive_inc/Kconfig.inc1 | 4 + .../tests/err_recursive_inc/Kconfig.inc2 | 3 + .../tests/err_recursive_inc/Kconfig.inc3 | 1 + .../tests/err_recursive_inc/__init__.py | 10 + .../tests/err_recursive_inc/expected_stderr | 6 + scripts/kconfig/tests/inter_choice/Kconfig | 23 + .../kconfig/tests/inter_choice/__init__.py | 14 + scripts/kconfig/tests/inter_choice/defconfig | 1 + .../tests/inter_choice/expected_config | 4 + .../kconfig/tests/new_choice_with_dep/Kconfig | 37 + .../tests/new_choice_with_dep/__init__.py | 14 + .../kconfig/tests/new_choice_with_dep/config | 3 + .../tests/new_choice_with_dep/expected_stdout | 10 + .../tests/no_write_if_dep_unmet/Kconfig | 14 + .../tests/no_write_if_dep_unmet/__init__.py | 19 + .../tests/no_write_if_dep_unmet/config | 1 + .../no_write_if_dep_unmet/expected_config | 5 + scripts/kconfig/tests/pytest.ini | 7 + .../kconfig/tests/rand_nested_choice/Kconfig | 33 + .../tests/rand_nested_choice/__init__.py | 16 + .../tests/rand_nested_choice/expected_stdout0 | 2 + .../tests/rand_nested_choice/expected_stdout1 | 4 + .../tests/rand_nested_choice/expected_stdout2 | 5 + .../kconfig/tests/warn_recursive_dep/Kconfig | 62 + .../tests/warn_recursive_dep/__init__.py | 9 + .../tests/warn_recursive_dep/expected_stderr | 30 + scripts/kconfig/util.c | 26 +- scripts/kconfig/zconf.gperf | 50 - scripts/kconfig/zconf.hash.c_shipped | 297 -- scripts/kconfig/zconf.l | 78 +- scripts/kconfig/zconf.lex.c_shipped | 2473 ----------------- scripts/kconfig/zconf.tab.c_shipped | 2471 ---------------- scripts/kconfig/zconf.y | 126 +- 77 files changed, 1693 insertions(+), 5621 deletions(-) create mode 100644 scripts/kconfig/kconf_id.c create mode 100644 scripts/kconfig/tests/auto_submenu/Kconfig create mode 100644 scripts/kconfig/tests/auto_submenu/__init__.py create mode 100644 scripts/kconfig/tests/auto_submenu/expected_stdout create mode 100644 scripts/kconfig/tests/choice/Kconfig create mode 100644 scripts/kconfig/tests/choice/__init__.py create mode 100644 scripts/kconfig/tests/choice/alldef_expected_config create mode 100644 scripts/kconfig/tests/choice/allmod_expected_config create mode 100644 scripts/kconfig/tests/choice/allno_expected_config create mode 100644 scripts/kconfig/tests/choice/allyes_expected_config create mode 100644 scripts/kconfig/tests/choice/oldask0_expected_stdout create mode 100644 scripts/kconfig/tests/choice/oldask1_config create mode 100644 scripts/kconfig/tests/choice/oldask1_expected_stdout create mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/Kconfig create mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/__init__.py create mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/config create mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/expected_config create mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/expected_stdout create mode 100644 scripts/kconfig/tests/conftest.py create mode 100644 scripts/kconfig/tests/err_recursive_inc/Kconfig create mode 100644 scripts/kconfig/tests/err_recursive_inc/Kconfig.inc1 create mode 100644 scripts/kconfig/tests/err_recursive_inc/Kconfig.inc2 create mode 100644 scripts/kconfig/tests/err_recursive_inc/Kconfig.inc3 create mode 100644 scripts/kconfig/tests/err_recursive_inc/__init__.py create mode 100644 scripts/kconfig/tests/err_recursive_inc/expected_stderr create mode 100644 scripts/kconfig/tests/inter_choice/Kconfig create mode 100644 scripts/kconfig/tests/inter_choice/__init__.py create mode 100644 scripts/kconfig/tests/inter_choice/defconfig create mode 100644 scripts/kconfig/tests/inter_choice/expected_config create mode 100644 scripts/kconfig/tests/new_choice_with_dep/Kconfig create mode 100644 scripts/kconfig/tests/new_choice_with_dep/__init__.py create mode 100644 scripts/kconfig/tests/new_choice_with_dep/config create mode 100644 scripts/kconfig/tests/new_choice_with_dep/expected_stdout create mode 100644 scripts/kconfig/tests/no_write_if_dep_unmet/Kconfig create mode 100644 scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py create mode 100644 scripts/kconfig/tests/no_write_if_dep_unmet/config create mode 100644 scripts/kconfig/tests/no_write_if_dep_unmet/expected_config create mode 100644 scripts/kconfig/tests/pytest.ini create mode 100644 scripts/kconfig/tests/rand_nested_choice/Kconfig create mode 100644 scripts/kconfig/tests/rand_nested_choice/__init__.py create mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout0 create mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout1 create mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout2 create mode 100644 scripts/kconfig/tests/warn_recursive_dep/Kconfig create mode 100644 scripts/kconfig/tests/warn_recursive_dep/__init__.py create mode 100644 scripts/kconfig/tests/warn_recursive_dep/expected_stderr delete mode 100644 scripts/kconfig/zconf.gperf delete mode 100644 scripts/kconfig/zconf.hash.c_shipped delete mode 100644 scripts/kconfig/zconf.lex.c_shipped delete mode 100644 scripts/kconfig/zconf.tab.c_shipped
.gitignore +2 -0
@@ -13,6 +13,7 @@ *.su *.mod.c *.i +*.lex.c *.lst *.order *.elf
@@ -20,6 +21,7 @@ *.bin *.patch *.cfgtmp +*.tab.[ch] # host programs on Cygwin *.exe
Makefile +7 -2
@@ -344,9 +344,13 @@ LDR = $(CROSS_COMPILE)ldr STRIP = $(CROSS_COMPILE)strip OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump +LEX = flex +YACC = bison AWK = awk PERL = perl PYTHON ?= python +PYTHON2 = python2 +PYTHON3 = python3 DTC ?= $(objtree)/scripts/dtc/dtc CHECK = sparse
@@ -369,7 +373,7 @@ export VERSION PATCHLEVEL SUBLEVEL UBOOTRELEASE UBOOTVERSION export ARCH CPU BOARD VENDOR SOC CPUDIR BOARDDIR export CONFIG_SHELL HOSTCC HOSTCFLAGS HOSTLDFLAGS CROSS_COMPILE AS LD CC export CPP AR NM LDR STRIP OBJCOPY OBJDUMP -export MAKE AWK PERL PYTHON +export MAKE LEX YACC AWK PERL PYTHON PYTHON2 PYTHON3 export HOSTCXX HOSTCXXFLAGS CHECK CHECKFLAGS DTC DTC_FLAGS export KBUILD_CPPFLAGS NOSTDINC_FLAGS UBOOTINCLUDE OBJCOPYFLAGS LDFLAGS
@@ -505,7 +509,7 @@ $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ; # if auto.conf.cmd is missing then we are probably in a cleaned tree so # we execute the config step to be sure to catch updated Kconfig files include/config/%.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd - $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig + $(Q)$(MAKE) -f $(srctree)/Makefile syncconfig @# If the following part fails, include/config/auto.conf should be @# deleted so "make silentoldconfig" will be re-run on the next build. $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.autoconf || \
@@ -1608,6 +1612,7 @@ clean: $(clean-dirs) \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ -o -name '*.ko.*' -o -name '*.su' -o -name '*.cfgtmp' \ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ + -o -name '*.lex.c' -o -name '*.tab.[ch]' \ -o -name '*.symtypes' -o -name 'modules.order' \ -o -name modules.builtin -o -name '.tmp_*.o.*' \ -o -name 'dsdt.aml' -o -name 'dsdt.asl.tmp' -o -name 'dsdt.c' \
scripts/Makefile.build +11 -0
@@ -415,6 +415,17 @@ $(call multi_depend, $(multi-used-m), .o, -objs -y) targets += $(multi-used-y) $(multi-used-m) +# Add intermediate targets: +# When building objects with specific suffix patterns, add intermediate +# targets that the final targets are derived from. +intermediate_targets = $(foreach sfx, $(2), \ + $(patsubst %$(strip $(1)),%$(sfx), \ + $(filter %$(strip $(1)), $(targets)))) +# %.lex.o <- %.lex.c <- %.l +# %.tab.o <- %.tab.[ch] <- %.y +targets += $(call intermediate_targets, .lex.o, .lex.c) \ + $(call intermediate_targets, .tab.o, .tab.c .tab.h) + # Descending # ---------------------------------------------------------------------------
scripts/Makefile.lib +12 -29
59 lines not on this page · raw message
scripts/kconfig/.gitignore +0 -5
@@ -1,11 +1,6 @@ # # Generated files # -config* -*.lex.c -*.tab.c -*.tab.h -zconf.hash.c *.moc gconf.glade.h *.pot
scripts/kconfig/Makefile +33 -18
131 lines not on this page · raw message
scripts/kconfig/check.sh +1 -0
@@ -1,4 +1,5 @@ #!/bin/sh +# SPDX-License-Identifier: GPL-2.0 # Needed for systems without gettext $* -x c -o /dev/null - > /dev/null 2>&1 << EOF #include <libintl.h>
scripts/kconfig/conf.c +52 -58
247 lines not on this page · raw message
scripts/kconfig/confdata.c +5 -5
@@ -28,7 +28,7 @@ static void conf_message(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));static const char *conf_filename; -static int conf_lineno, conf_warnings, conf_unsaved; +static int conf_lineno, conf_warnings;const char conf_defname[] ="arch/$ARCH/defconfig" ;
@@ -174,7 +174,7 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)case S_HEX : done:if (sym_string_valid (sym, p)) { - sym->def[def].val =strdup (p); + sym->def[def].val =xstrdup (p); sym->flags |= def_flags; }else {if (def !=S_DEF_AUTO )
@@ -197,7 +197,7 @@ static int add_byte(int c, char **lineptr, size_t slen, size_t *n)if (new_size > *n) { new_size +=LINE_GROWTH -1 ; new_size *=2 ; - nline =realloc (*lineptr, new_size); + nline =xrealloc (*lineptr, new_size);if (!nline)return -1 ;
@@ -286,7 +286,6 @@ load: conf_filename = name; conf_lineno =0 ; conf_warnings =0 ; - conf_unsaved =0 ; def_flags =SYMBOL_DEF << def; for_all_symbols(i, sym) {
@@ -405,6 +404,7 @@ setsym:int conf_read (const char *name) {struct symbol *sym; +int conf_unsaved =0 ;int i;sym_set_change_count (0 );
@@ -1121,7 +1121,7 @@ void set_all_choice_values(struct symbol *csym)bool conf_set_all_new_symbols (enum conf_def_mode mode) {struct symbol *sym, *csym; -int i, cnt, pby, pty, ptm;/* pby: probability of boolean = y +int i, cnt, pby, pty, ptm;/* pby: probability of bool = y * pty: probability of tristate = y * ptm: probability of tristate = m */
scripts/kconfig/expr.c +146 -47
306 lines not on this page · raw message
scripts/kconfig/expr.h +91 -2
148 lines not on this page · raw message
scripts/kconfig/gconf.c +1 -1
@@ -914,7 +914,7 @@ on_treeview2_button_press_event(GtkWidget * widget, current = menu;display_tree_part ();gtk_widget_set_sensitive (back_btn, TRUE); - }else if ((col ==COL_OPTION )) { + }else if (col ==COL_OPTION ) {toggle_sym_value (menu);gtk_tree_view_expand_row (view, path, TRUE); }
scripts/kconfig/kconf_id.c new file +53 -0
53 lines not on this page · raw message
scripts/kconfig/kxgettext.c +1 -1
@@ -101,7 +101,7 @@ static struct message *message__new(const char *msg, char *option,if (self->files ==NULL ) goto out_fail; - self->msg =strdup (msg); + self->msg =xstrdup (msg);if (self->msg ==NULL ) goto out_fail_msg;
scripts/kconfig/list.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef LIST_H #define LIST_H
scripts/kconfig/lkc.h +4 -2
@@ -62,12 +62,13 @@ enum conf_def_mode {#define T_OPT_ALLNOCONFIG_Y 4struct kconf_id { -int name; +const char *name;int token;unsigned int flags;enum symbol_type stype; }; +extern int yylineno;void zconfdump (FILE *out);void zconf_starthelp (void );FILE *zconf_fopen (const char *name);
@@ -100,7 +101,6 @@ void menu_warn(struct menu *menu, const char *fmt, ...);struct menu *menu_add_menu (void );void menu_end_menu (void );void menu_add_entry (struct symbol *sym); -void menu_end_entry (void );void menu_add_dep (struct expr *dep);void menu_add_visibility (struct expr *dep);struct property *menu_add_prompt (enum prop_type type,char *prompt,struct expr *dep);
@@ -115,6 +115,8 @@ struct file *file_lookup(const char *name);int file_write_dep (const char *name);void *xmalloc (size_t size);void *xcalloc (size_t nmemb,size_t size); +void *xrealloc (void *p,size_t size); +char *xstrdup (const char *s);struct gstr {size_t len;
scripts/kconfig/lkc_proto.h +2 -1
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <stdarg.h> /* confdata.c */
@@ -30,7 +31,7 @@ extern struct symbol * symbol_hash[SYMBOL_HASHSIZE];struct symbol *sym_lookup (const char *name,int flags);struct symbol *sym_find (const char *name); -const char *sym_expand_string_value (const char *in); +char *sym_expand_string_value (const char *in);const char *sym_escape_string_value (const char *in);struct symbol **sym_re_search (const char *pattern);const char *sym_type_name (enum symbol_type type);
scripts/kconfig/lxdialog/check-lxdialog.sh +3 -1
@@ -1,4 +1,5 @@ #!/bin/sh +# SPDX-License-Identifier: GPL-2.0 # Check ncurses compatibility # What library to link
@@ -54,7 +55,8 @@ EOF echo " *** required header files." 1>&2 echo " *** 'make menuconfig' requires the ncurses libraries." 1>&2 echo " *** " 1>&2 - echo " *** Install ncurses (ncurses-devel) and try again." 1>&2 + echo " *** Install ncurses (ncurses-devel or libncurses-dev " 1>&2 + echo " *** depending on your distribution) and try again." 1>&2 echo " *** " 1>&2 exit 1 fi
scripts/kconfig/mconf.c +1 -1
@@ -246,7 +246,7 @@ search_help[] = N_(" Selected by: BAR [=n]\n" "-----------------------------------------------------------------\n" "o The line 'Type:' shows the type of the configuration option for\n" -" this symbol (boolean, tristate, string, ...)\n" +" this symbol (bool, tristate, string, ...)\n" "o The line 'Prompt:' shows the text used in the menu structure for\n" " this symbol\n" "o The 'Defined at' line tells at what file / line number the symbol\n"
scripts/kconfig/menu.c +174 -21
343 lines not on this page · raw message
scripts/kconfig/nconf.c +6 -6
@@ -271,7 +271,7 @@ static struct mitem k_menu_items[MAX_MENU_ITEMS];static int items_num;static int global_exit;/* the currently selected button */ -const char *current_instructions = menu_instructions; +static const char *current_instructions = menu_instructions;static char *dialog_input_result;static int dialog_input_result_len;
@@ -305,7 +305,7 @@ struct function_keys { };static const int function_keys_num =9 ; -struct function_keys function_keys[] = { +static struct function_keys function_keys[] = { { .key_str ="F1" , .func ="Help" ,
@@ -508,7 +508,7 @@ static int get_mext_match(const char *match_str, match_f flag) index = (index + items_num) % items_num;while (true) {char *str = k_menu_items[index].str; -if (strcasestr (str, match_str) !=0 ) +if (strcasestr (str, match_str) !=NULL )return index;if (flag ==FIND_NEXT_MATCH_UP || flag ==MATCH_TINKER_PATTERN_UP )
@@ -1067,7 +1067,7 @@ static int do_match(int key, struct match_state *state, int *ans)static void conf (struct menu *menu) { -struct menu *submenu =0 ; +struct menu *submenu =NULL ;const char *prompt =menu_get_prompt (menu);struct symbol *sym;int res;
@@ -1234,7 +1234,7 @@ static void show_help(struct menu *menu)static void conf_choice (struct menu *menu) {const char *prompt =_ (menu_get_prompt (menu)); -struct menu *child =0 ; +struct menu *child =NULL ;struct symbol *active;int selected_index =0 ;int last_top_row =0 ;
@@ -1456,7 +1456,7 @@ static void conf_save(void) } } -void setup_windows (void ) +static void setup_windows (void ) {int lines, columns;
scripts/kconfig/nconf.gui.c +4 -3
@@ -6,6 +6,7 @@* */ #include "nconf.h" +#include "lkc.h" /* a list of all the different widgets we use */ attributes_t attributes[ATTR_MAX +1 ] = {0 };
@@ -129,7 +130,7 @@ static void no_colors_theme(void)mkattrn (FUNCTION_TEXT ,A_REVERSE ); } -void set_colors () +void set_colors (void ) {start_color ();use_default_colors ();
@@ -192,7 +193,7 @@ const char *get_line(const char *text, int line_no)int lines =0 ;if (!text) -return 0 ; +return NULL ;for (i =0 ; text[i] !='\0' && lines < line_no; i++)if (text[i] =='\n' )
@@ -374,7 +375,7 @@ int dialog_inputbox(WINDOW *main_window,if (strlen (init)+1 > *result_len) { *result_len =strlen (init)+1 ; - *resultp = result =realloc (result, *result_len); + *resultp = result =xrealloc (result, *result_len); }/* find the widest line of msg: */
scripts/kconfig/nconf.h +1 -3
@@ -15,7 +15,7 @@#include <string.h> #include <unistd.h> #include <locale.h> -#include <curses.h> +#include <ncurses.h> #include <menu.h> #include <panel.h> #include <form.h>
@@ -24,8 +24,6 @@#include <time.h> #include <sys/time.h> -#include "ncurses.h" -#define max (a, b) ({\ typeof(a) _a = a;\ typeof(b) _b = b;\
scripts/kconfig/streamline_config.pl +2 -1
@@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/env perl # # Copyright 2005-2009 - Steven Rostedt # Licensed under the terms of the GNU GPL License version 2
@@ -42,6 +42,7 @@ # mv config_strip .config # make oldconfig # +use warnings; use strict; use Getopt::Long;
scripts/kconfig/symbol.c +49 -31
180 lines not on this page · raw message
scripts/kconfig/tests/auto_submenu/Kconfig new file +50 -0
50 lines not on this page · raw message
scripts/kconfig/tests/auto_submenu/__init__.py new file +12 -0
@@ -0,0 +1,12 @@ +""" +Create submenu for symbols that depend on the preceding one. + +If a symbols has dependency on the preceding symbol, the menu entry +should become the submenu of the preceding one, and displayed with +deeper indentation. +""" + + +def test(conf): + assert conf.oldaskconfig() == 0 + assert conf.stdout_contains('expected_stdout')
scripts/kconfig/tests/auto_submenu/expected_stdout new file +10 -0
@@ -0,0 +1,10 @@ +A (A) [Y/n/?] (NEW) + A0 (A0) [Y/n/?] (NEW) + A1_0 (A0_0) [N/y/?] (NEW) + A1 (A1) [Y/n/?] (NEW) + choice + > 1. A1_0 (A1_0) (NEW) + 2. A1_1 (A1_1) (NEW) + choice[1-2?]: +B (B) [N/y/?] (NEW) +C (C) [N/y/?] (NEW)
scripts/kconfig/tests/choice/Kconfig new file +54 -0
54 lines not on this page · raw message
scripts/kconfig/tests/choice/__init__.py new file +40 -0
@@ -0,0 +1,40 @@ +""" +Basic choice tests. + +The handling of 'choice' is a bit complicated part in Kconfig. + +The behavior of 'y' choice is intuitive. If choice values are tristate, +the choice can be 'm' where each value can be enabled independently. +Also, if a choice is marked as 'optional', the whole choice can be +invisible. +""" + + +def test_oldask0(conf): + assert conf.oldaskconfig() == 0 + assert conf.stdout_contains('oldask0_expected_stdout') + + +def test_oldask1(conf): + assert conf.oldaskconfig('oldask1_config') == 0 + assert conf.stdout_contains('oldask1_expected_stdout') + + +def test_allyes(conf): + assert conf.allyesconfig() == 0 + assert conf.config_contains('allyes_expected_config') + + +def test_allmod(conf): + assert conf.allmodconfig() == 0 + assert conf.config_contains('allmod_expected_config') + + +def test_allno(conf): + assert conf.allnoconfig() == 0 + assert conf.config_contains('allno_expected_config') + + +def test_alldef(conf): + assert conf.alldefconfig() == 0 + assert conf.config_contains('alldef_expected_config')
scripts/kconfig/tests/choice/alldef_expected_config new file +5 -0
@@ -0,0 +1,5 @@ +CONFIG_MODULES=y +# CONFIG_BOOL_CHOICE0 is not set +CONFIG_BOOL_CHOICE1=y +# CONFIG_TRI_CHOICE0 is not set +# CONFIG_TRI_CHOICE1 is not set
scripts/kconfig/tests/choice/allmod_expected_config new file +9 -0
@@ -0,0 +1,9 @@ +CONFIG_MODULES=y +# CONFIG_BOOL_CHOICE0 is not set +CONFIG_BOOL_CHOICE1=y +# CONFIG_OPT_BOOL_CHOICE0 is not set +CONFIG_OPT_BOOL_CHOICE1=y +CONFIG_TRI_CHOICE0=m +CONFIG_TRI_CHOICE1=m +CONFIG_OPT_TRI_CHOICE0=m +CONFIG_OPT_TRI_CHOICE1=m
scripts/kconfig/tests/choice/allno_expected_config new file +5 -0
@@ -0,0 +1,5 @@ +# CONFIG_MODULES is not set +# CONFIG_BOOL_CHOICE0 is not set +CONFIG_BOOL_CHOICE1=y +# CONFIG_TRI_CHOICE0 is not set +CONFIG_TRI_CHOICE1=y
scripts/kconfig/tests/choice/allyes_expected_config new file +9 -0
@@ -0,0 +1,9 @@ +CONFIG_MODULES=y +# CONFIG_BOOL_CHOICE0 is not set +CONFIG_BOOL_CHOICE1=y +# CONFIG_OPT_BOOL_CHOICE0 is not set +CONFIG_OPT_BOOL_CHOICE1=y +# CONFIG_TRI_CHOICE0 is not set +CONFIG_TRI_CHOICE1=y +# CONFIG_OPT_TRI_CHOICE0 is not set +CONFIG_OPT_TRI_CHOICE1=y
scripts/kconfig/tests/choice/oldask0_expected_stdout new file +10 -0
@@ -0,0 +1,10 @@ +Enable loadable module support (MODULES) [Y/n/?] (NEW) +boolean choice + 1. choice 0 (BOOL_CHOICE0) (NEW) +> 2. choice 1 (BOOL_CHOICE1) (NEW) +choice[1-2?]: +optional boolean choice [N/y/?] (NEW) +tristate choice [M/y/?] (NEW) + choice 0 (TRI_CHOICE0) [N/m/?] (NEW) + choice 1 (TRI_CHOICE1) [N/m/?] (NEW) +optional tristate choice [N/m/y/?] (NEW)
scripts/kconfig/tests/choice/oldask1_config new file +2 -0
@@ -0,0 +1,2 @@ +# CONFIG_MODULES is not set +CONFIG_OPT_BOOL_CHOICE0=y
scripts/kconfig/tests/choice/oldask1_expected_stdout new file +15 -0
@@ -0,0 +1,15 @@ +Enable loadable module support (MODULES) [N/y/?] +boolean choice + 1. choice 0 (BOOL_CHOICE0) (NEW) +> 2. choice 1 (BOOL_CHOICE1) (NEW) +choice[1-2?]: +optional boolean choice [Y/n/?] (NEW) +optional boolean choice +> 1. choice 0 (OPT_BOOL_CHOICE0) + 2. choice 1 (OPT_BOOL_CHOICE1) (NEW) +choice[1-2?]: +tristate choice + 1. choice 0 (TRI_CHOICE0) (NEW) +> 2. choice 1 (TRI_CHOICE1) (NEW) +choice[1-2?]: +optional tristate choice [N/y/?]
scripts/kconfig/tests/choice_value_with_m_dep/Kconfig new file +19 -0
@@ -0,0 +1,19 @@ +config MODULES + def_bool y + option modules + +config DEP + tristate + default m + +choice + prompt "Tristate Choice" + +config CHOICE0 + tristate "Choice 0" + +config CHOICE1 + tristate "Choice 1" + depends on DEP + +endchoice
scripts/kconfig/tests/choice_value_with_m_dep/__init__.py new file +15 -0
@@ -0,0 +1,15 @@ +""" +Hide tristate choice values with mod dependency in y choice. + +If tristate choice values depend on symbols set to 'm', they should be +hidden when the choice containing them is changed from 'm' to 'y' +(i.e. exclusive choice). + +Related Linux commit: fa64e5f6a35efd5e77d639125d973077ca506074 +""" + + +def test(conf): + assert conf.oldaskconfig('config', 'y') == 0 + assert conf.config_contains('expected_config') + assert conf.stdout_contains('expected_stdout')
scripts/kconfig/tests/choice_value_with_m_dep/config new file +2 -0
@@ -0,0 +1,2 @@ +CONFIG_CHOICE0=m +CONFIG_CHOICE1=m
scripts/kconfig/tests/choice_value_with_m_dep/expected_config new file +3 -0
@@ -0,0 +1,3 @@ +CONFIG_MODULES=y +CONFIG_DEP=m +CONFIG_CHOICE0=y
scripts/kconfig/tests/choice_value_with_m_dep/expected_stdout new file +4 -0
@@ -0,0 +1,4 @@ +Tristate Choice [M/y/?] y +Tristate Choice +> 1. Choice 0 (CHOICE0) +choice[1]: 1
scripts/kconfig/tests/conftest.py new file +291 -0
291 lines not on this page · raw message
scripts/kconfig/tests/err_recursive_inc/Kconfig new file +1 -0
@@ -0,0 +1 @@ +source "Kconfig.inc1"
scripts/kconfig/tests/err_recursive_inc/Kconfig.inc1 new file +4 -0
@@ -0,0 +1,4 @@ + + + +source "Kconfig.inc2"
scripts/kconfig/tests/err_recursive_inc/Kconfig.inc2 new file +3 -0
@@ -0,0 +1,3 @@ + + +source "Kconfig.inc3"
scripts/kconfig/tests/err_recursive_inc/Kconfig.inc3 new file +1 -0
@@ -0,0 +1 @@ +source "Kconfig.inc1"
scripts/kconfig/tests/err_recursive_inc/__init__.py new file +10 -0
@@ -0,0 +1,10 @@ +""" +Detect recursive inclusion error. + +If recursive inclusion is detected, it should fail with error messages. +""" + + +def test(conf): + assert conf.oldaskconfig() != 0 + assert conf.stderr_contains('expected_stderr')
scripts/kconfig/tests/err_recursive_inc/expected_stderr new file +6 -0
@@ -0,0 +1,6 @@ +Recursive inclusion detected. +Inclusion path: + current file : Kconfig.inc1 + included from: Kconfig.inc3:1 + included from: Kconfig.inc2:3 + included from: Kconfig.inc1:4
scripts/kconfig/tests/inter_choice/Kconfig new file +23 -0
@@ -0,0 +1,23 @@ +config MODULES + def_bool y + option modules + +choice + prompt "Choice" + +config CHOICE_VAL0 + tristate "Choice 0" + +config CHOIVE_VAL1 + tristate "Choice 1" + +endchoice + +choice + prompt "Another choice" + depends on CHOICE_VAL0 + +config DUMMY + bool "dummy" + +endchoice
scripts/kconfig/tests/inter_choice/__init__.py new file +14 -0
@@ -0,0 +1,14 @@ +""" +Do not affect user-assigned choice value by another choice. + +Handling of state flags for choices is complecated. In old days, +the defconfig result of a choice could be affected by another choice +if those choices interact by 'depends on', 'select', etc. + +Related Linux commit: fbe98bb9ed3dae23e320c6b113e35f129538d14a +""" + + +def test(conf): + assert conf.defconfig('defconfig') == 0 + assert conf.config_contains('expected_config')
scripts/kconfig/tests/inter_choice/defconfig new file +1 -0
@@ -0,0 +1 @@ +CONFIG_CHOICE_VAL0=y
scripts/kconfig/tests/inter_choice/expected_config new file +4 -0
@@ -0,0 +1,4 @@ +CONFIG_MODULES=y +CONFIG_CHOICE_VAL0=y +# CONFIG_CHOIVE_VAL1 is not set +CONFIG_DUMMY=y
scripts/kconfig/tests/new_choice_with_dep/Kconfig new file +37 -0
@@ -0,0 +1,37 @@ +config A + bool "A" + help + This is a new symbol. + +choice + prompt "Choice ?" + depends on A + help + "depends on A" has been newly added. + +config CHOICE_B + bool "Choice B" + +config CHOICE_C + bool "Choice C" + help + This is a new symbol, so should be asked. + +endchoice + +choice + prompt "Choice2 ?" + +config CHOICE_D + bool "Choice D" + +config CHOICE_E + bool "Choice E" + +config CHOICE_F + bool "Choice F" + depends on A + help + This is a new symbol, so should be asked. + +endchoice
scripts/kconfig/tests/new_choice_with_dep/__init__.py new file +14 -0
@@ -0,0 +1,14 @@ +""" +Ask new choice values when they become visible. + +If new choice values are added with new dependency, and they become +visible during user configuration, oldconfig should recognize them +as (NEW), and ask the user for choice. + +Related Linux commit: 5d09598d488f081e3be23f885ed65cbbe2d073b5 +""" + + +def test(conf): + assert conf.oldconfig('config', 'y') == 0 + assert conf.stdout_contains('expected_stdout')
scripts/kconfig/tests/new_choice_with_dep/config new file +3 -0
@@ -0,0 +1,3 @@ +CONFIG_CHOICE_B=y +# CONFIG_CHOICE_D is not set +CONFIG_CHOICE_E=y
scripts/kconfig/tests/new_choice_with_dep/expected_stdout new file +10 -0
@@ -0,0 +1,10 @@ +A (A) [N/y/?] (NEW) y + Choice ? + > 1. Choice B (CHOICE_B) + 2. Choice C (CHOICE_C) (NEW) + choice[1-2?]: +Choice2 ? + 1. Choice D (CHOICE_D) +> 2. Choice E (CHOICE_E) + 3. Choice F (CHOICE_F) (NEW) +choice[1-3?]:
scripts/kconfig/tests/no_write_if_dep_unmet/Kconfig new file +14 -0
@@ -0,0 +1,14 @@ +config A + bool "A" + +choice + prompt "Choice ?" + depends on A + +config CHOICE_B + bool "Choice B" + +config CHOICE_C + bool "Choice C" + +endchoice
scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py new file +19 -0
@@ -0,0 +1,19 @@ +""" +Do not write choice values to .config if the dependency is unmet. + +"# CONFIG_... is not set" should not be written into the .config file +for symbols with unmet dependency. + +This was not working correctly for choice values because choice needs +a bit different symbol computation. + +This checks that no unneeded "# COFIG_... is not set" is contained in +the .config file. + +Related Linux commit: cb67ab2cd2b8abd9650292c986c79901e3073a59 +""" + + +def test(conf): + assert conf.oldaskconfig('config', 'n') == 0 + assert conf.config_matches('expected_config')
scripts/kconfig/tests/no_write_if_dep_unmet/config new file +1 -0
@@ -0,0 +1 @@ +CONFIG_A=y
scripts/kconfig/tests/no_write_if_dep_unmet/expected_config new file +5 -0
@@ -0,0 +1,5 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux Kernel Configuration +# +# CONFIG_A is not set
scripts/kconfig/tests/pytest.ini new file +7 -0
@@ -0,0 +1,7 @@ +[pytest] +addopts = --verbose + +# Pytest requires that test files have unique names, because pytest imports +# them as top-level modules. It is silly to prefix or suffix a test file with +# the directory name that contains it. Use __init__.py for all test files. +python_files = __init__.py
scripts/kconfig/tests/rand_nested_choice/Kconfig new file +33 -0
@@ -0,0 +1,33 @@ +choice + prompt "choice" + +config A + bool "A" + +config B + bool "B" + +if B +choice + prompt "sub choice" + +config C + bool "C" + +config D + bool "D" + +if D +choice + prompt "subsub choice" + +config E + bool "E" + +endchoice +endif # D + +endchoice +endif # B + +endchoice
scripts/kconfig/tests/rand_nested_choice/__init__.py new file +16 -0
@@ -0,0 +1,16 @@ +""" +Set random values recursively in nested choices. + +Kconfig can create a choice-in-choice structure by using 'if' statement. +randconfig should correctly set random choice values. + +Related Linux commit: 3b9a19e08960e5cdad5253998637653e592a3c29 +""" + + +def test(conf): + for i in range(20): + assert conf.randconfig() == 0 + assert (conf.config_contains('expected_stdout0') or + conf.config_contains('expected_stdout1') or + conf.config_contains('expected_stdout2'))
scripts/kconfig/tests/rand_nested_choice/expected_stdout0 new file +2 -0
@@ -0,0 +1,2 @@ +CONFIG_A=y +# CONFIG_B is not set
scripts/kconfig/tests/rand_nested_choice/expected_stdout1 new file +4 -0
@@ -0,0 +1,4 @@ +# CONFIG_A is not set +CONFIG_B=y +CONFIG_C=y +# CONFIG_D is not set
scripts/kconfig/tests/rand_nested_choice/expected_stdout2 new file +5 -0
@@ -0,0 +1,5 @@ +# CONFIG_A is not set +CONFIG_B=y +# CONFIG_C is not set +CONFIG_D=y +CONFIG_E=y
scripts/kconfig/tests/warn_recursive_dep/Kconfig new file +62 -0
62 lines not on this page · raw message
scripts/kconfig/tests/warn_recursive_dep/__init__.py new file +9 -0
@@ -0,0 +1,9 @@ +""" +Warn recursive inclusion. + +Recursive dependency should be warned. +""" + +def test(conf): + assert conf.oldaskconfig() == 0 + assert conf.stderr_contains('expected_stderr')
scripts/kconfig/tests/warn_recursive_dep/expected_stderr new file +30 -0
@@ -0,0 +1,30 @@ +Kconfig:9:error: recursive dependency detected! +Kconfig:9: symbol B is selected by B +For a resolution refer to Documentation/kbuild/kconfig-language.txt +subsection "Kconfig recursive dependency limitations" + +Kconfig:3:error: recursive dependency detected! +Kconfig:3: symbol A depends on A +For a resolution refer to Documentation/kbuild/kconfig-language.txt +subsection "Kconfig recursive dependency limitations" + +Kconfig:15:error: recursive dependency detected! +Kconfig:15: symbol C1 depends on C2 +Kconfig:19: symbol C2 depends on C1 +For a resolution refer to Documentation/kbuild/kconfig-language.txt +subsection "Kconfig recursive dependency limitations" + +Kconfig:30:error: recursive dependency detected! +Kconfig:30: symbol D2 is selected by D1 +Kconfig:25: symbol D1 depends on D2 +For a resolution refer to Documentation/kbuild/kconfig-language.txt +subsection "Kconfig recursive dependency limitations" + +Kconfig:59:error: recursive dependency detected! +Kconfig:59: symbol G depends on G +For a resolution refer to Documentation/kbuild/kconfig-language.txt +subsection "Kconfig recursive dependency limitations" + +Kconfig:50:error: recursive dependency detected! +Kconfig:50: symbol F2 depends on F1 +Kconfig:48: symbol F1 default value contains F2
scripts/kconfig/util.c +23 -3
@@ -14,11 +14,11 @@struct file *file_lookup (const char *name) {struct file *file; -const char *file_name =sym_expand_string_value (name); +char *file_name =sym_expand_string_value (name);for (file = file_list; file; file = file->next) {if (!strcmp (name, file->name)) { -free ((void *)file_name); +free (file_name);return file; } }
@@ -104,7 +104,7 @@ void str_append(struct gstr *gs, const char *s)if (s) { l =strlen (gs->s) +strlen (s) +1 ;if (l > gs->len) { - gs->s =realloc (gs->s, l); + gs->s =xrealloc (gs->s, l); gs->len = l; }strcat (gs->s, s);
@@ -145,3 +145,23 @@ void *xcalloc(size_t nmemb, size_t size)fprintf (stderr,"Out of memory.\n" );exit (1 ); } + +void *xrealloc (void *p,size_t size) +{ + p =realloc (p, size); +if (p) +return p; +fprintf (stderr,"Out of memory.\n" ); +exit (1 ); +} + +char *xstrdup (const char *s) +{ +char *p; + + p =strdup (s); +if (p) +return p; +fprintf (stderr,"Out of memory.\n" ); +exit (1 ); +}
scripts/kconfig/zconf.gperf deleted +0 -50
50 lines not on this page · raw message
scripts/kconfig/zconf.hash.c_shipped deleted +0 -297
227 lines not on this page · raw message
scripts/kconfig/zconf.l +38 -40
78 lines not on this page · raw message
scripts/kconfig/zconf.lex.c_shipped deleted +0 -2473
2,473 lines not on this page · raw message
scripts/kconfig/zconf.tab.c_shipped deleted +0 -2471
2,471 lines not on this page · raw message
scripts/kconfig/zconf.y +77 -49
126 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.17.0
Part of the diff is not shown here. View the raw message.
PATCH v2 2/6 board: eets: pdu001: Fix wrong default value in Kconfig
After importing linux v4.16-rc1 commit 2c37e08464a8 ("kconfig: Warn if choice default is not in choice"), Kconfig complains:
scripts/kconfig/conf --syncconfig Kconfig
board/eets/pdu001/Kconfig:22:warning: \
choice default symbol 'PDU001_RUN_LED_RED' \
is not contained in the choice
This looks to be caused by a typo. Fix it.
---
v1->v2:
* Added: Reviewed-by: Masahiro Yamada <[email protected]>
board/eets/pdu001/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
board/eets/pdu001/Kconfig +1 -1
@@ -19,7 +19,7 @@ config SYS_CONFIG_NAME choice prompt "State of Run LED" - default PDU001_RUN_LED_RED + default RUN_LED_RED help The PDU001 has a bi-color (red/green) LED labeled 'Run' which can be used to indicate the operating state of the board. By
Signature · 1 line
2.17.0
PATCH v2 3/6 scripts/dtc: Update to upstream version v1.4.5-6-gc1e55a5513e9
In reply to Eugeniu RoscaFrom: Rob Herring <[email protected]>
Pickup the fix for handling unresolved phandles in overlays.
This adds the following commits from upstream:
c1e55a5513e9 checks: fix handling of unresolved phandles for dts plugins f8872e29ce06 tests: Avoid 64-bit arithmetic in assembler 48c91c08bcfa libfdt: add stringlist functions to linker script
---
v1->v2:
* Newly pushed
scripts/dtc/checks.c | 9 +++++++++ scripts/dtc/version_gen.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-)
scripts/dtc/checks.c +9 -0
@@ -988,6 +988,10 @@ static void check_property_phandle_args(struct check *c,* entries when each index position has a specific definition. */ if (phandle ==0 || phandle ==-1 ) { +/* Give up if this is an overlay with external references */ +if (dti->dtsflags &DTSF_PLUGIN ) +break ; + cellsize =0 ;continue ; }
@@ -1176,6 +1180,11 @@ static void check_interrupts_property(struct check *c, prop =get_property (parent,"interrupt-parent" );if (prop) { phandle =propval_cell (prop); +/* Give up if this is an overlay with external references */ +if ((phandle ==0 || phandle ==-1 ) && + (dti->dtsflags &DTSF_PLUGIN )) +return ; + irq_node =get_node_by_phandle (root, phandle);if (!irq_node) { FAIL(c, dti, "Bad interrupt-parent phandle for %s",
scripts/dtc/version_gen.h +1 -1
@@ -1 +1 @@ -#define DTC_VERSION "DTC 1.4.5-gb1a60033" +#define DTC_VERSION "DTC 1.4.5-gc1e55a55"
Signature · 1 line
2.17.0
PATCH v2 3/6 scripts/dtc: Update to upstream version v1.4.5-6-gc1e55a5513e9
Quoted 13 lines · Eugeniu Rosca
From: Rob Herring <[email protected]>
Pickup the fix for handling unresolved phandles in overlays.
This adds the following commits from upstream:
c1e55a5513e9checks: fix handling of unresolved phandles for dts pluginsf8872e29ce06tests: Avoid 64-bit arithmetic in assembler48c91c08bcfalibfdt: add stringlist functions to linker scriptSigned-off-by Rob Herring <[email protected]>[ Linux commit: e45fe7f788dd1395befe5639149ad8dacfbd94ab ]Signed-off-by Eugeniu Rosca <[email protected]>
Quoted 8 lines
---
v1->v2:
* Newly pushedscripts/dtc/checks.c | 9 +++++++++ scripts/dtc/version_gen.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-)
PATCH v2 3/6 scripts/dtc: Update to upstream version v1.4.5-6-gc1e55a5513e9
In reply to Eugeniu Rosca2018-05-13 2:13 GMT+09:00 Eugeniu Rosca <[email protected]>:
Quoted 10 lines
From: Rob Herring <[email protected]>
Pickup the fix for handling unresolved phandles in overlays.
This adds the following commits from upstream:
c1e55a5513e9checks: fix handling of unresolved phandles for dts pluginsf8872e29ce06tests: Avoid 64-bit arithmetic in assembler48c91c08bcfalibfdt: add stringlist functions to linker script
Quoted 7 lines
Signed-off-by Rob Herring <[email protected]>[ Linux commit: e45fe7f788dd1395befe5639149ad8dacfbd94ab ]Signed-off-by Eugeniu Rosca <[email protected]>---
v1->v2:
* Newly pushed
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH v2 3/6 scripts/dtc: Update to upstream version v1.4.5-6-gc1e55a5513e9
Quoted 16 lines · Masahiro Yamada
2018-05-13 2:13 GMT+09:00 Eugeniu Rosca <[email protected]>:
Quoted 15 lines
From: Rob Herring <[email protected]>
Pickup the fix for handling unresolved phandles in overlays.
This adds the following commits from upstream:
c1e55a5513e9checks: fix handling of unresolved phandles for dts pluginsf8872e29ce06tests: Avoid 64-bit arithmetic in assembler48c91c08bcfalibfdt: add stringlist functions to linker scriptSigned-off-by Rob Herring <[email protected]>[ Linux commit: e45fe7f788dd1395befe5639149ad8dacfbd94ab ]Signed-off-by Eugeniu Rosca <[email protected]>---
Quoted 5 lines
Quoted 2 lines
v1->v2:
* Newly pushedReviewed-by Masahiro Yamada <[email protected]>
Thanks for the recent reviews!
Quoted 4 lines
Signature · 3 lines
-- Best Regards Masahiro Yamada
Best regards,
Eugeniu.
PATCH v2 4/6 scripts/dtc: Update to upstream version v1.4.6-9-gaadd0b65c987
In reply to Eugeniu RoscaFrom: Rob Herring <[email protected]>
This adds the following commits from upstream:
aadd0b65c987 checks: centralize printing of property names in failure messages 88960e398907 checks: centralize printing of node path in check_msg f1879e1a50eb Add limited read-only support for older (V2 and V3) device tree to libfdt. 37dea76e9700 srcpos: drop special handling of tab65893da4aee0 libfdt: overlay: Add missing license962a45ca034d Avoid installing pylibfdt when dependencies are missing cd6ea1b2bea6 Makefile: Split INSTALL out into INSTALL_{PROGRAM,LIB,DATA,SCRIPT} 51b3a16338df Makefile.tests: Add LIBDL make(1) variable for portability sake 333d533a8f4d Attempt to auto-detect stat(1) being used if not given proper invocation e54388015af1 dtc: Bump version to v1.4.6a1fe86f380cb fdtoverlay: Switch from using alloca to mallocc8d5472de3ff tests: Improve compatibility with other platforms c81d389a10cc checks: add chosen node checkse671852042a7 checks: add aliases node checksd0c44ebe3f42 checks: check for #{size,address}-cells without child nodes 18a3d84bb802 checks: add string list check for *-names properties 8fe94fd6f19f checks: add string list check6c5730819604 checks: add a string check for 'label' propertya384191eba09 checks: fix sound-dai phandle with arg property check b260c4f610c0 Fix ambiguous grammar for devicetree rulefe667e382bac tests: Add some basic tests for the pci_bridge checks 7975f6422260 Fix widespread incorrect use of strneq(), replace with new strprefixeq() fca296445eab Add strstarts() helper functioncc392f089007 tests: Check non-matching cases for fdt_node_check_compatible() bba26a5291c8 livetree: avoid assertion of orphan phandles with overlays c8f8194d76cc implement strnlen for systems that need itc8b38f65fdec libfdt: Remove leading underscores from identifiers 3b62fdaebfe5 Remove leading underscores from identifiers2d45d1c5c65e Replace FDT_VERSION() with stringify()2e6fe5a107b5 Fix some errors in commentsb0ae9e4b0ceb tests: Correct warning in sw_tree1.c
Commit c8b38f65fdec upstream ("libfdt: Remove leading underscores from identifiers") changed the multiple inclusion define protection, so the kernel's libfdt_env.h needs the corresponding update.
[erosca: - Fixup conflicts in include/linux/libfdt_env.h caused by v2018.03-rc4
commit b08c8c487083 ("libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>")
- Fix build errors in lib/libfdt/fdt_ro.c, tools/libfdt/fdt_rw.c by:
- s/_fdt_mem_rsv/fdt_mem_rsv_/
- s/_fdt_offset_ptr/fdt_offset_ptr_/
- s/_fdt_check_node_offset/fdt_check_node_offset_/
- s/_fdt_check_prop_offset/fdt_check_prop_offset_/
- s/_fdt_find_add_string/fdt_find_add_string_/]
---
v1-v2:
* Newly pushed
include/linux/libfdt_env.h | 6 +- lib/libfdt/fdt_ro.c | 18 +- scripts/dtc/checks.c | 439 ++++++++++++++++++--------- scripts/dtc/dtc-parser.y | 17 +- scripts/dtc/dtc.c | 7 +- scripts/dtc/dtc.h | 11 +- scripts/dtc/flattree.c | 2 +- scripts/dtc/libfdt/fdt.c | 13 +- scripts/dtc/libfdt/fdt.h | 6 +- scripts/dtc/libfdt/fdt_overlay.c | 51 ++++ scripts/dtc/libfdt/fdt_ro.c | 132 ++++++-- scripts/dtc/libfdt/fdt_rw.c | 90 +++--- scripts/dtc/libfdt/fdt_sw.c | 24 +- scripts/dtc/libfdt/fdt_wip.c | 10 +- scripts/dtc/libfdt/libfdt.h | 37 +-- scripts/dtc/libfdt/libfdt_env.h | 33 +- scripts/dtc/libfdt/libfdt_internal.h | 32 +- scripts/dtc/livetree.c | 10 +- scripts/dtc/srcpos.c | 5 - scripts/dtc/srcpos.h | 6 +- scripts/dtc/util.h | 9 +- scripts/dtc/version_gen.h | 2 +- tools/libfdt/fdt_rw.c | 2 +- 23 files changed, 632 insertions(+), 330 deletions(-)
include/linux/libfdt_env.h +3 -3
@@ -6,8 +6,8 @@* Using the same guard name as that of scripts/dtc/libfdt/libfdt_env.h * prevents it from being included. */ -#ifndef _LIBFDT_ENV_H -#define _LIBFDT_ENV_H +#ifndef LIBFDT_ENV_H +#define LIBFDT_ENV_H #include <linux/string.h>
@@ -27,5 +27,5 @@ typedef __be64 fdt64_t;#define strtoul (cp, endp, base) simple_strtoul(cp, endp, base) -#endif /* _LIBFDT_ENV_H */ +#endif /* LIBFDT_ENV_H */ #endif
lib/libfdt/fdt_ro.c +9 -9
@@ -76,8 +76,8 @@ uint32_t fdt_get_max_phandle(const void *fdt)int fdt_get_mem_rsv (const void *fdt,int n,uint64_t *address,uint64_t *size) {FDT_CHECK_HEADER (fdt); - *address =fdt64_to_cpu (_fdt_mem_rsv (fdt, n)->address); - *size =fdt64_to_cpu (_fdt_mem_rsv (fdt, n)->size); + *address =fdt64_to_cpu (fdt_mem_rsv_ (fdt, n)->address); + *size =fdt64_to_cpu (fdt_mem_rsv_ (fdt, n)->size);return 0 ; }
@@ -85,7 +85,7 @@ int fdt_num_mem_rsv(const void *fdt) {int i =0 ; -while (fdt64_to_cpu (_fdt_mem_rsv (fdt, i)->size) !=0 ) +while (fdt64_to_cpu (fdt_mem_rsv_ (fdt, i)->size) !=0 ) i++;return i; }
@@ -211,11 +211,11 @@ int fdt_path_offset(const void *fdt, const char *path)const char *fdt_get_name (const void *fdt,int nodeoffset,int *len) { -const struct fdt_node_header *nh =_fdt_offset_ptr (fdt, nodeoffset); +const struct fdt_node_header *nh =fdt_offset_ptr_ (fdt, nodeoffset);int err;if (((err =fdt_check_header (fdt)) !=0 ) - || ((err =_fdt_check_node_offset (fdt, nodeoffset)) <0 )) + || ((err =fdt_check_node_offset_ (fdt, nodeoffset)) <0 )) goto fail;if (len)
@@ -233,7 +233,7 @@ int fdt_first_property_offset(const void *fdt, int nodeoffset) {int offset; -if ((offset =_fdt_check_node_offset (fdt, nodeoffset)) <0 ) +if ((offset =fdt_check_node_offset_ (fdt, nodeoffset)) <0 )return offset;return _nextprop (fdt, offset);
@@ -241,7 +241,7 @@ int fdt_first_property_offset(const void *fdt, int nodeoffset)int fdt_next_property_offset (const void *fdt,int offset) { -if ((offset =_fdt_check_prop_offset (fdt, offset)) <0 ) +if ((offset =fdt_check_prop_offset_ (fdt, offset)) <0 )return offset;return _nextprop (fdt, offset);
@@ -254,13 +254,13 @@ const struct fdt_property *fdt_get_property_by_offset(const void *fdt,int err;const struct fdt_property *prop; -if ((err =_fdt_check_prop_offset (fdt, offset)) <0 ) { +if ((err =fdt_check_prop_offset_ (fdt, offset)) <0 ) {if (lenp) *lenp = err;return NULL ; } - prop =_fdt_offset_ptr (fdt, offset); + prop =fdt_offset_ptr_ (fdt, offset);if (lenp) *lenp =fdt32_to_cpu (prop->len);
scripts/dtc/checks.c +290 -149
833 lines not on this page · raw message
scripts/dtc/dtc-parser.y +11 -6
@@ -166,7 +166,17 @@ devicetree: { $$ = merge_nodes($1, $3); } - + | DT_REF nodedef + { + /* + * We rely on the rule being always: + * versioninfo plugindecl memreserves devicetree + * so $-1 is what we want (plugindecl) + */ + if (!($<flags>-1 & DTSF_PLUGIN)) + ERROR(&@2, "Label or path %s not found", $1); + $$ = add_orphan_node(name_node(build_node(NULL, NULL), ""), $2, $1); + } | devicetree DT_LABEL DT_REF nodedef { struct node *target = get_node_by_ref($1, $3);
@@ -209,11 +219,6 @@ devicetree: $$ = $1; } - | /* empty */ - { - /* build empty node */ - $$ = name_node(build_node(NULL, NULL), ""); - } ; nodedef:
scripts/dtc/dtc.c +3 -4
@@ -59,8 +59,6 @@ static void fill_fullpaths(struct node *tree, const char *prefix) }/* Usage related data. */ -#define FDT_VERSION (version) _FDT_VERSION(version) -#define _FDT_VERSION (version) #versionstatic const char usage_synopsis[] ="dtc [options] <input file>" ;static const char usage_short_opts[] ="qI:O:o:V:d:R:S:p:a:fb:i:H:sW:E:@Ahv" ;static struct option const usage_long_opts[] = {
@@ -98,7 +96,7 @@ static const char * const usage_opts_help[] = {"\t\tdts - device tree source text\n" "\t\tdtb - device tree blob\n" "\t\tasm - assembler source" , - "\n\tBlob version to produce, defaults to "FDT_VERSION(DEFAULT_FDT_VERSION)" (for dtb and asm output)", + "\n\tBlob version to produce, defaults to "stringify(DEFAULT_FDT_VERSION)" (for dtb and asm output)","\n\tOutput dependency file" ,"\n\tMake space for <number> reserve map entries (for dtb and asm output)" , "\n\tMake the blob at least <bytes> long (extra space)",
@@ -319,13 +317,14 @@ int main(int argc, char *argv[]) dti->boot_cpuid_phys = cmdline_boot_cpuid;fill_fullpaths (dti->dt,"" ); -process_checks (force, dti);/* on a plugin, generate by default */ if (dti->dtsflags &DTSF_PLUGIN ) { generate_fixups =1 ; } +process_checks (force, dti); +if (auto_label_aliases)generate_label_tree (dti,"aliases" , false);
scripts/dtc/dtc.h +6 -5
@@ -1,5 +1,5 @@ -#ifndef _DTC_H -#define _DTC_H +#ifndef DTC_H +#define DTC_H /* * (C) Copyright David Gibson <[email protected]>, IBM Corporation. 2005.
@@ -67,7 +67,8 @@ typedef uint32_t cell_t;#define streq (a, b) (strcmp((a), (b)) == 0) -#define strneq (a, b, n) (strncmp((a), (b), (n)) == 0) +#define strstarts (s, prefix) (strncmp((s), (prefix), strlen(prefix)) == 0) +#define strprefixeq (a, n, b) (strlen(b) == (n) && (memcmp(a, b, n) == 0))#define ALIGN (x, a) (((x) + (a) - 1) & ~((a) - 1))
@@ -203,7 +204,7 @@ struct node *build_node_delete(void);struct node *name_node (struct node *node,char *name);struct node *chain_node (struct node *first,struct node *list);struct node *merge_nodes (struct node *old_node,struct node *new_node); -void add_orphan_node (struct node *old_node,struct node *new_node,char *ref); +struct node *add_orphan_node (struct node *old_node,struct node *new_node,char *ref);void add_property (struct node *node,struct property *prop);void delete_property_by_name (struct node *node,char *name);
@@ -289,4 +290,4 @@ struct dt_info *dt_from_source(const char *f);struct dt_info *dt_from_fs (const char *dirname); -#endif /* _DTC_H */ +#endif /* DTC_H */
scripts/dtc/flattree.c +1 -1
@@ -731,7 +731,7 @@ static char *nodename_from_path(const char *ppath, const char *cpath) plen =strlen (ppath); -if (!strneq (ppath, cpath, plen)) +if (!strstarts (cpath, ppath))die ("Path \"%s\" is not valid as a child of \"%s\"\n" , cpath, ppath);
scripts/dtc/libfdt/fdt.c +8 -5
@@ -88,7 +88,7 @@ const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len) || ((offset + len) > fdt_size_dt_struct(fdt)))return NULL ; -return _fdt_offset_ptr (fdt, offset); +return fdt_offset_ptr_ (fdt, offset); }uint32_t fdt_next_tag (const void *fdt,int startoffset,int *nextoffset)
@@ -123,6 +123,9 @@ uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset)/* skip-name offset, length and value */ offset +=sizeof (struct fdt_property ) -FDT_TAGSIZE +fdt32_to_cpu (*lenp); +if (fdt_version (fdt) <0x10 &&fdt32_to_cpu (*lenp) >=8 && + ((offset -fdt32_to_cpu (*lenp)) %8 ) !=0 ) + offset +=4 ;break ;case FDT_END :
@@ -141,7 +144,7 @@ uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset)return tag; } -int _fdt_check_node_offset (const void *fdt,int offset) +int fdt_check_node_offset_ (const void *fdt,int offset) {if ((offset <0 ) || (offset %FDT_TAGSIZE ) || (fdt_next_tag (fdt, offset, &offset) !=FDT_BEGIN_NODE ))
@@ -150,7 +153,7 @@ int _fdt_check_node_offset(const void *fdt, int offset)return offset; } -int _fdt_check_prop_offset (const void *fdt,int offset) +int fdt_check_prop_offset_ (const void *fdt,int offset) {if ((offset <0 ) || (offset %FDT_TAGSIZE ) || (fdt_next_tag (fdt, offset, &offset) !=FDT_PROP ))
@@ -165,7 +168,7 @@ int fdt_next_node(const void *fdt, int offset, int *depth)uint32_t tag;if (offset >=0 ) -if ((nextoffset =_fdt_check_node_offset (fdt, offset)) <0 ) +if ((nextoffset =fdt_check_node_offset_ (fdt, offset)) <0 )return nextoffset; do {
@@ -227,7 +230,7 @@ int fdt_next_subnode(const void *fdt, int offset)return offset; } -const char *_fdt_find_string (const char *strtab,int tabsize,const char *s) +const char *fdt_find_string_ (const char *strtab,int tabsize,const char *s) {int len =strlen (s) +1 ;const char *last = strtab + tabsize - len;
scripts/dtc/libfdt/fdt.h +3 -3
@@ -1,5 +1,5 @@ -#ifndef _FDT_H -#define _FDT_H +#ifndef FDT_H +#define FDT_H /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation.
@@ -108,4 +108,4 @@ struct fdt_property {#define FDT_V16_SIZE FDT_V3_SIZE#define FDT_V17_SIZE (FDT_V16_SIZE + sizeof(fdt32_t)) -#endif /* _FDT_H */ +#endif /* FDT_H */
scripts/dtc/libfdt/fdt_overlay.c +51 -0
54 lines not on this page · raw message
scripts/dtc/libfdt/fdt_ro.c +101 -31
250 lines not on this page · raw message
scripts/dtc/libfdt/fdt_rw.c +45 -45
284 lines not on this page · raw message
scripts/dtc/libfdt/fdt_sw.c +12 -12
@@ -55,7 +55,7 @@#include "libfdt_internal.h" -static int _fdt_sw_check_header (void *fdt) +static int fdt_sw_check_header_ (void *fdt) {if (fdt_magic (fdt) !=FDT_SW_MAGIC )return -FDT_ERR_BADMAGIC ;
@@ -66,11 +66,11 @@ static int _fdt_sw_check_header(void *fdt)#define FDT_SW_CHECK_HEADER (fdt) \ { \ int err; \ - if ((err = _fdt_sw_check_header(fdt)) != 0) \ + if ((err = fdt_sw_check_header_(fdt)) != 0) \ return err; \ } -static void *_fdt_grab_space (void *fdt,size_t len) +static void *fdt_grab_space_ (void *fdt,size_t len) {int offset =fdt_size_dt_struct (fdt);int spaceleft;
@@ -82,7 +82,7 @@ static void *_fdt_grab_space(void *fdt, size_t len)return NULL ;fdt_set_size_dt_struct (fdt, offset + len); -return _fdt_offset_ptr_w (fdt, offset); +return fdt_offset_ptr_w_ (fdt, offset); }int fdt_create (void *buf,int bufsize)
@@ -174,7 +174,7 @@ int fdt_begin_node(void *fdt, const char *name)FDT_SW_CHECK_HEADER (fdt); - nh =_fdt_grab_space (fdt,sizeof (*nh) +FDT_TAGALIGN (namelen)); + nh =fdt_grab_space_ (fdt,sizeof (*nh) +FDT_TAGALIGN (namelen));if (! nh)return -FDT_ERR_NOSPACE ;
@@ -189,7 +189,7 @@ int fdt_end_node(void *fdt)FDT_SW_CHECK_HEADER (fdt); - en =_fdt_grab_space (fdt,FDT_TAGSIZE ); + en =fdt_grab_space_ (fdt,FDT_TAGSIZE );if (! en)return -FDT_ERR_NOSPACE ;
@@ -197,7 +197,7 @@ int fdt_end_node(void *fdt)return 0 ; } -static int _fdt_find_add_string (void *fdt,const char *s) +static int fdt_find_add_string_ (void *fdt,const char *s) {char *strtab = (char *)fdt +fdt_totalsize (fdt);const char *p;
@@ -205,7 +205,7 @@ static int _fdt_find_add_string(void *fdt, const char *s)int len =strlen (s) +1 ;int struct_top, offset; - p =_fdt_find_string (strtab - strtabsize, strtabsize, s); + p =fdt_find_string_ (strtab - strtabsize, strtabsize, s);if (p)return p - strtab;
@@ -227,11 +227,11 @@ int fdt_property_placeholder(void *fdt, const char *name, int len, void **valp)FDT_SW_CHECK_HEADER (fdt); - nameoff =_fdt_find_add_string (fdt, name); + nameoff =fdt_find_add_string_ (fdt, name);if (nameoff ==0 )return -FDT_ERR_NOSPACE ; - prop =_fdt_grab_space (fdt,sizeof (*prop) +FDT_TAGALIGN (len)); + prop =fdt_grab_space_ (fdt,sizeof (*prop) +FDT_TAGALIGN (len));if (! prop)return -FDT_ERR_NOSPACE ;
@@ -265,7 +265,7 @@ int fdt_finish(void *fdt)FDT_SW_CHECK_HEADER (fdt);/* Add terminator */ - end =_fdt_grab_space (fdt,sizeof (*end)); + end =fdt_grab_space_ (fdt,sizeof (*end));if (! end)return -FDT_ERR_NOSPACE ; *end =cpu_to_fdt32 (FDT_END );
@@ -281,7 +281,7 @@ int fdt_finish(void *fdt)while ((tag =fdt_next_tag (fdt, offset, &nextoffset)) !=FDT_END ) {if (tag ==FDT_PROP ) {struct fdt_property *prop = -_fdt_offset_ptr_w (fdt, offset); +fdt_offset_ptr_w_ (fdt, offset);int nameoff; nameoff =fdt32_to_cpu (prop->nameoff);
scripts/dtc/libfdt/fdt_wip.c +5 -5
@@ -93,7 +93,7 @@ int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name, val, len); } -static void _fdt_nop_region (void *start,int len) +static void fdt_nop_region_ (void *start,int len) {fdt32_t *p;
@@ -110,12 +110,12 @@ int fdt_nop_property(void *fdt, int nodeoffset, const char *name)if (!prop)return len; -_fdt_nop_region (prop, len +sizeof (*prop)); +fdt_nop_region_ (prop, len +sizeof (*prop));return 0 ; } -int _fdt_node_end_offset (void *fdt,int offset) +int fdt_node_end_offset_ (void *fdt,int offset) {int depth =0 ;
@@ -129,11 +129,11 @@ int fdt_nop_node(void *fdt, int nodeoffset) {int endoffset; - endoffset =_fdt_node_end_offset (fdt, nodeoffset); + endoffset =fdt_node_end_offset_ (fdt, nodeoffset);if (endoffset <0 )return endoffset; -_fdt_nop_region (fdt_offset_ptr_w (fdt, nodeoffset,0 ), +fdt_nop_region_ (fdt_offset_ptr_w (fdt, nodeoffset,0 ), endoffset - nodeoffset);return 0 ; }
scripts/dtc/libfdt/libfdt.h +20 -17
@@ -1,5 +1,5 @@ -#ifndef _LIBFDT_H -#define _LIBFDT_H +#ifndef LIBFDT_H +#define LIBFDT_H /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation.
@@ -54,7 +54,7 @@#include "libfdt_env.h" #include "fdt.h" -#define FDT_FIRST_SUPPORTED_VERSION 0x10 +#define FDT_FIRST_SUPPORTED_VERSION 0x02#define FDT_LAST_SUPPORTED_VERSION 0x11/* Error codes: informative error codes */
@@ -225,23 +225,23 @@ int fdt_next_subnode(const void *fdt, int offset);#define fdt_size_dt_strings (fdt) (fdt_get_header(fdt, size_dt_strings))#define fdt_size_dt_struct (fdt) (fdt_get_header(fdt, size_dt_struct)) -#define __fdt_set_hdr (name) \ +#define fdt_set_hdr_ (name) \ static inline void fdt_set_##name(void *fdt, uint32_t val) \ { \ struct fdt_header *fdth = (struct fdt_header *)fdt; \ fdth->name = cpu_to_fdt32(val); \ } -__fdt_set_hdr (magic); -__fdt_set_hdr (totalsize); -__fdt_set_hdr (off_dt_struct); -__fdt_set_hdr (off_dt_strings); -__fdt_set_hdr (off_mem_rsvmap); -__fdt_set_hdr (version); -__fdt_set_hdr (last_comp_version); -__fdt_set_hdr (boot_cpuid_phys); -__fdt_set_hdr (size_dt_strings); -__fdt_set_hdr (size_dt_struct); -#undef __fdt_set_hdr +fdt_set_hdr_ (magic); +fdt_set_hdr_ (totalsize); +fdt_set_hdr_ (off_dt_struct); +fdt_set_hdr_ (off_dt_strings); +fdt_set_hdr_ (off_mem_rsvmap); +fdt_set_hdr_ (version); +fdt_set_hdr_ (last_comp_version); +fdt_set_hdr_ (boot_cpuid_phys); +fdt_set_hdr_ (size_dt_strings); +fdt_set_hdr_ (size_dt_struct); +#undef fdt_set_hdr_/** * fdt_check_header - sanity check a device tree or possible device tree
@@ -527,6 +527,9 @@ int fdt_next_property_offset(const void *fdt, int offset);* offset. If lenp is non-NULL, the length of the property value is * also returned, in the integer pointed to by lenp. * +* Note that this code only works on device tree versions >= 16. fdt_getprop() +* works on all versions. +* * returns: * pointer to the structure representing the property * if lenp is non-NULL, *lenp contains the length of the property
@@ -1449,7 +1452,7 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name, const void *val, int len);/** -* fdt_setprop _placeholder - allocate space for a property +* fdt_setprop_placeholder - allocate space for a property * @fdt: pointer to the device tree blob * @nodeoffset: offset of the node whose property to change * @name: name of the property to change
@@ -1896,4 +1899,4 @@ int fdt_overlay_apply(void *fdt, void *fdto);const char *fdt_strerror (int errval); -#endif /* _LIBFDT_H */ +#endif /* LIBFDT_H */
scripts/dtc/libfdt/libfdt_env.h +30 -3
@@ -1,5 +1,5 @@ -#ifndef _LIBFDT_ENV_H -#define _LIBFDT_ENV_H +#ifndef LIBFDT_ENV_H +#define LIBFDT_ENV_H /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation.
@@ -109,4 +109,31 @@ static inline fdt64_t cpu_to_fdt64(uint64_t x)#undef CPU_TO_FDT16#undef EXTRACT_BYTE -#endif /* _LIBFDT_ENV_H */ +#ifdef __APPLE__ +#include <AvailabilityMacros.h> + +/* strnlen() is not available on Mac OS < 10.7 */ +# if !defined(MAC_OS_X_VERSION_10_7 ) || (MAC_OS_X_VERSION_MAX_ALLOWED < \ +MAC_OS_X_VERSION_10_7 ) + +#define strnlen fdt_strnlen + +/* +* fdt_strnlen: returns the length of a string or max_count - which ever is +* smallest. +* Input 1 string: the string whose size is to be determined +* Input 2 max_count: the maximum value returned by this function +* Output: length of the string or max_count (the smallest of the two) +*/ +static inline size_t fdt_strnlen (const char *string,size_t max_count) +{ +const char *p =memchr (string,0 , max_count); +return p ? p - string : max_count; +} + +#endif /* !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED < +MAC_OS_X_VERSION_10_7) */ + +#endif /* __APPLE__ */ + +#endif /* LIBFDT_ENV_H */
scripts/dtc/libfdt/libfdt_internal.h +16 -16
@@ -1,5 +1,5 @@ -#ifndef _LIBFDT_INTERNAL_H -#define _LIBFDT_INTERNAL_H +#ifndef LIBFDT_INTERNAL_H +#define LIBFDT_INTERNAL_H /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation.
@@ -57,27 +57,27 @@#define FDT_CHECK_HEADER (fdt) \ { \ - int __err; \ - if ((__err = fdt_check_header(fdt)) != 0) \ - return __err; \ + int err_; \ + if ((err_ = fdt_check_header(fdt)) != 0) \ + return err_; \ } -int _fdt_check_node_offset (const void *fdt,int offset); -int _fdt_check_prop_offset (const void *fdt,int offset); -const char *_fdt_find_string (const char *strtab,int tabsize,const char *s); -int _fdt_node_end_offset (void *fdt,int nodeoffset); +int fdt_check_node_offset_ (const void *fdt,int offset); +int fdt_check_prop_offset_ (const void *fdt,int offset); +const char *fdt_find_string_ (const char *strtab,int tabsize,const char *s); +int fdt_node_end_offset_ (void *fdt,int nodeoffset); -static inline const void *_fdt_offset_ptr (const void *fdt,int offset) +static inline const void *fdt_offset_ptr_ (const void *fdt,int offset) {return (const char *)fdt +fdt_off_dt_struct (fdt) + offset; } -static inline void *_fdt_offset_ptr_w (void *fdt,int offset) +static inline void *fdt_offset_ptr_w_ (void *fdt,int offset) { -return (void *)(uintptr_t )_fdt_offset_ptr (fdt, offset); +return (void *)(uintptr_t )fdt_offset_ptr_ (fdt, offset); } -static inline const struct fdt_reserve_entry *_fdt_mem_rsv (const void *fdt,int n) +static inline const struct fdt_reserve_entry *fdt_mem_rsv_ (const void *fdt,int n) {const struct fdt_reserve_entry *rsv_table = (const struct fdt_reserve_entry *)
@@ -85,11 +85,11 @@ static inline const struct fdt_reserve_entry *_fdt_mem_rsv(const void *fdt, int return rsv_table + n; } -static inline struct fdt_reserve_entry *_fdt_mem_rsv_w (void *fdt,int n) +static inline struct fdt_reserve_entry *fdt_mem_rsv_w_ (void *fdt,int n) { -return (void *)(uintptr_t )_fdt_mem_rsv (fdt, n); +return (void *)(uintptr_t )fdt_mem_rsv_ (fdt, n); }#define FDT_SW_MAGIC (~FDT_MAGIC) -#endif /* _LIBFDT_INTERNAL_H */ +#endif /* LIBFDT_INTERNAL_H */
scripts/dtc/livetree.c +7 -3
@@ -216,7 +216,7 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node)return old_node; } -void add_orphan_node (struct node *dt,struct node *new_node,char *ref) +struct node *add_orphan_node (struct node *dt,struct node *new_node,char *ref) {static unsigned int next_orphan_fragment =0 ;struct node *node;
@@ -236,6 +236,7 @@ void add_orphan_node(struct node *dt, struct node *new_node, char *ref)name_node (node, name);add_child (dt, node); +return dt; }struct node *chain_node (struct node *first,struct node *list)
@@ -507,7 +508,7 @@ struct node *get_node_by_path(struct node *tree, const char *path)for_each_child (tree, child) {if (p && (strlen (child->name) == p-path) && -strneq (path, child->name, p-path)) +strprefixeq (path, p - path, child->name))return get_node_by_path (child, p+1 );else if (!p &&streq (path, child->name))return child;
@@ -540,7 +541,10 @@ struct node *get_node_by_phandle(struct node *tree, cell_t phandle) {struct node *child, *node; -assert ((phandle !=0 ) && (phandle !=-1 )); +if ((phandle ==0 ) || (phandle ==-1 )) { +assert (generate_fixups); +return NULL ; + }if (tree->phandle == phandle) {if (tree->deleted)
scripts/dtc/srcpos.c +0 -5
@@ -209,8 +209,6 @@ struct srcpos srcpos_empty = { .file = NULL, }; -#define TAB_SIZE 8 -void srcpos_update (struct srcpos *pos,const char *text,int len) {int i;
@@ -224,9 +222,6 @@ void srcpos_update(struct srcpos *pos, const char *text, int len)if (text[i] =='\n' ) { current_srcfile->lineno++; current_srcfile->colno =1 ; - }else if (text[i] =='\t' ) { - current_srcfile->colno = -ALIGN (current_srcfile->colno,TAB_SIZE ); }else { current_srcfile->colno++; }
scripts/dtc/srcpos.h +3 -3
@@ -17,8 +17,8 @@* USA */ -#ifndef _SRCPOS_H_ -#define _SRCPOS_H_ +#ifndef SRCPOS_H +#define SRCPOS_H #include <stdio.h> #include <stdbool.h>
@@ -114,4 +114,4 @@ extern void PRINTF(3, 4) srcpos_error(struct srcpos *pos, const char *prefix,extern void srcpos_set_line (char *f,int l); -#endif /* _SRCPOS_H_ */ +#endif /* SRCPOS_H */
scripts/dtc/util.h +6 -3
@@ -1,5 +1,5 @@ -#ifndef _UTIL_H -#define _UTIL_H +#ifndef UTIL_H +#define UTIL_H #include <stdarg.h> #include <stdbool.h>
@@ -35,6 +35,9 @@#define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0])) +#define stringify (s) stringify_(s) +#define stringify_ (s) #s + static inline void NORETURN PRINTF(1, 2) die(const char *str, ...) {va_list ap;
@@ -260,4 +263,4 @@ void NORETURN util_usage(const char *errmsg, const char *synopsis,case 'V' :util_version (); \case '?' :usage ("unknown option" ); -#endif /* _UTIL_H */ +#endif /* UTIL_H */
scripts/dtc/version_gen.h +1 -1
@@ -1 +1 @@ -#define DTC_VERSION "DTC 1.4.5-gc1e55a55" +#define DTC_VERSION "DTC 1.4.6-gaadd0b65"
tools/libfdt/fdt_rw.c +1 -1
@@ -25,7 +25,7 @@ int fdt_remove_unused_strings(const void *old, void *new) new_prop = (struct fdt_property *)(unsigned long )fdt_get_property_by_offset (new, offset,NULL ); str =fdt_string (old,fdt32_to_cpu (old_prop->nameoff)); - ret =_fdt_find_add_string (new, str); + ret =fdt_find_add_string_ (new, str);if (ret <0 )return ret; new_prop->nameoff =cpu_to_fdt32 (ret);
Signature · 1 line
2.17.0
PATCH v2 4/6 scripts/dtc: Update to upstream version v1.4.6-9-gaadd0b65c987
Hi,
Quoted 73 lines · Eugeniu Rosca
From: Rob Herring <[email protected]>
This adds the following commits from upstream:
aadd0b65c987checks: centralize printing of property names in failure messages88960e398907checks: centralize printing of node path incheck_msgf1879e1a50ebAdd limited read-only support for older (V2 and V3) device tree to libfdt.37dea76e9700srcpos: drop special handling of tab65893da4aee0libfdt: overlay: Add missing license962a45ca034dAvoid installing pylibfdt when dependencies are missingcd6ea1b2bea6Makefile: Split INSTALL out into INSTALL_{PROGRAM,LIB,DATA,SCRIPT}51b3a16338dfMakefile.tests: Add LIBDL make(1) variable for portability sake333d533a8f4dAttempt to auto-detect stat(1) being used if not given proper invocatione54388015af1dtc: Bump version to v1.4.6a1fe86f380cbfdtoverlay: Switch from using alloca to mallocc8d5472de3fftests: Improve compatibility with other platformsc81d389a10ccchecks: add chosen node checkse671852042a7checks: add aliases node checksd0c44ebe3f42checks: check for #{size,address}-cells without child nodes18a3d84bb802checks: add string list check for *-names properties8fe94fd6f19fchecks: add string list check6c5730819604checks: add a string check for 'label' propertya384191eba09checks: fix sound-dai phandle with arg property checkb260c4f610c0Fix ambiguous grammar for devicetree rulefe667e382bactests: Add some basic tests for thepci_bridgechecks7975f6422260Fix widespread incorrect use ofstrneq(), replace with newstrprefixeq()fca296445eabAddstrstarts()helper functioncc392f089007tests: Check non-matching cases forfdt_node_check_compatible()bba26a5291c8livetree: avoid assertion of orphan phandles with overlaysc8f8194d76ccimplement strnlen for systems that need itc8b38f65fdeclibfdt: Remove leading underscores from identifiers3b62fdaebfe5Remove leading underscores from identifiers2d45d1c5c65eReplaceFDT_VERSION()withstringify()2e6fe5a107b5Fix some errors in commentsb0ae9e4b0cebtests: Correct warning insw_tree1.cCommit
c8b38f65fdecupstream ("libfdt: Remove leading underscores from identifiers") changed the multiple inclusion define protection, so the kernel'slibfdt_env.hneeds the corresponding update.Signed-off-by Rob Herring <[email protected]>[ Linux commit: 9130ba884640328bb78aaa4840e5ddf06ccafb1c ][erosca: - Fixup conflicts in
include/linux/libfdt_env.hcaused by v2018.03-rc4
commitb08c8c487083("libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>")
- Fix build errors inlib/libfdt/fdt_ro.c,tools/libfdt/fdt_rw.cby:
- s/_fdt_mem_rsv/fdt_mem_rsv_/
- s/_fdt_offset_ptr/fdt_offset_ptr_/
- s/_fdt_check_node_offset/fdt_check_node_offset_/
- s/_fdt_check_prop_offset/fdt_check_prop_offset_/
- s/_fdt_find_add_string/fdt_find_add_string_/]Signed-off-by Eugeniu Rosca <[email protected]>---
v1-v2:
* Newly pushedinclude/linux/libfdt_env.h | 6 +- lib/libfdt/fdt_ro.c | 18 +- scripts/dtc/checks.c | 439 ++++++++++++++++++--------- scripts/dtc/dtc-parser.y | 17 +- scripts/dtc/dtc.c | 7 +- scripts/dtc/dtc.h | 11 +- scripts/dtc/flattree.c | 2 +- scripts/dtc/libfdt/fdt.c | 13 +- scripts/dtc/libfdt/fdt.h | 6 +- scripts/dtc/libfdt/fdt_overlay.c | 51 ++++ scripts/dtc/libfdt/fdt_ro.c | 132 ++++++-- scripts/dtc/libfdt/fdt_rw.c | 90 +++--- scripts/dtc/libfdt/fdt_sw.c | 24 +- scripts/dtc/libfdt/fdt_wip.c | 10 +- scripts/dtc/libfdt/libfdt.h | 37 +-- scripts/dtc/libfdt/libfdt_env.h | 33 +-
Quoted 8 lines
scripts/dtc/libfdt/libfdt_internal.h | 32 +- scripts/dtc/livetree.c | 10 +- scripts/dtc/srcpos.c | 5 - scripts/dtc/srcpos.h | 6 +- scripts/dtc/util.h | 9 +- scripts/dtc/version_gen.h | 2 +- tools/libfdt/fdt_rw.c | 2 +- 23 files changed, 632 insertions(+), 330 deletions(-)
Can you please check that this does not adversely impact code size?
Regards,
Simon
PATCH v2 4/6 scripts/dtc: Update to upstream version v1.4.6-9-gaadd0b65c987
Hi Simon,
Quoted 85 lines · Simon Glass
Hi,
Quoted 73 lines · Eugeniu Rosca
From: Rob Herring <[email protected]>
This adds the following commits from upstream:
aadd0b65c987checks: centralize printing of property names in failure messages88960e398907checks: centralize printing of node path incheck_msgf1879e1a50ebAdd limited read-only support for older (V2 and V3) device tree to libfdt.37dea76e9700srcpos: drop special handling of tab65893da4aee0libfdt: overlay: Add missing license962a45ca034dAvoid installing pylibfdt when dependencies are missingcd6ea1b2bea6Makefile: Split INSTALL out into INSTALL_{PROGRAM,LIB,DATA,SCRIPT}51b3a16338dfMakefile.tests: Add LIBDL make(1) variable for portability sake333d533a8f4dAttempt to auto-detect stat(1) being used if not given proper invocatione54388015af1dtc: Bump version to v1.4.6a1fe86f380cbfdtoverlay: Switch from using alloca to mallocc8d5472de3fftests: Improve compatibility with other platformsc81d389a10ccchecks: add chosen node checkse671852042a7checks: add aliases node checksd0c44ebe3f42checks: check for #{size,address}-cells without child nodes18a3d84bb802checks: add string list check for *-names properties8fe94fd6f19fchecks: add string list check6c5730819604checks: add a string check for 'label' propertya384191eba09checks: fix sound-dai phandle with arg property checkb260c4f610c0Fix ambiguous grammar for devicetree rulefe667e382bactests: Add some basic tests for thepci_bridgechecks7975f6422260Fix widespread incorrect use ofstrneq(), replace with newstrprefixeq()fca296445eabAddstrstarts()helper functioncc392f089007tests: Check non-matching cases forfdt_node_check_compatible()bba26a5291c8livetree: avoid assertion of orphan phandles with overlaysc8f8194d76ccimplement strnlen for systems that need itc8b38f65fdeclibfdt: Remove leading underscores from identifiers3b62fdaebfe5Remove leading underscores from identifiers2d45d1c5c65eReplaceFDT_VERSION()withstringify()2e6fe5a107b5Fix some errors in commentsb0ae9e4b0cebtests: Correct warning insw_tree1.cCommit
c8b38f65fdecupstream ("libfdt: Remove leading underscores from identifiers") changed the multiple inclusion define protection, so the kernel'slibfdt_env.hneeds the corresponding update.Signed-off-by Rob Herring <[email protected]>[ Linux commit: 9130ba884640328bb78aaa4840e5ddf06ccafb1c ][erosca: - Fixup conflicts in
include/linux/libfdt_env.hcaused by v2018.03-rc4
commitb08c8c487083("libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>")
- Fix build errors inlib/libfdt/fdt_ro.c,tools/libfdt/fdt_rw.cby:
- s/_fdt_mem_rsv/fdt_mem_rsv_/
- s/_fdt_offset_ptr/fdt_offset_ptr_/
- s/_fdt_check_node_offset/fdt_check_node_offset_/
- s/_fdt_check_prop_offset/fdt_check_prop_offset_/
- s/_fdt_find_add_string/fdt_find_add_string_/]Signed-off-by Eugeniu Rosca <[email protected]>---
v1-v2:
* Newly pushedinclude/linux/libfdt_env.h | 6 +- lib/libfdt/fdt_ro.c | 18 +- scripts/dtc/checks.c | 439 ++++++++++++++++++--------- scripts/dtc/dtc-parser.y | 17 +- scripts/dtc/dtc.c | 7 +- scripts/dtc/dtc.h | 11 +- scripts/dtc/flattree.c | 2 +- scripts/dtc/libfdt/fdt.c | 13 +- scripts/dtc/libfdt/fdt.h | 6 +- scripts/dtc/libfdt/fdt_overlay.c | 51 ++++ scripts/dtc/libfdt/fdt_ro.c | 132 ++++++-- scripts/dtc/libfdt/fdt_rw.c | 90 +++--- scripts/dtc/libfdt/fdt_sw.c | 24 +- scripts/dtc/libfdt/fdt_wip.c | 10 +- scripts/dtc/libfdt/libfdt.h | 37 +-- scripts/dtc/libfdt/libfdt_env.h | 33 +-Quoted 8 lines
scripts/dtc/libfdt/libfdt_internal.h | 32 +- scripts/dtc/livetree.c | 10 +- scripts/dtc/srcpos.c | 5 - scripts/dtc/srcpos.h | 6 +- scripts/dtc/util.h | 9 +- scripts/dtc/version_gen.h | 2 +- tools/libfdt/fdt_rw.c | 2 +- 23 files changed, 632 insertions(+), 330 deletions(-)
Quoted 1 line
Can you please check that this does not adversely impact code size?
Sure. Here are the sizes before and after this patch (sandbox):
1. ELF size comparison shows 96 bytes increase
$ du -b u-boot.before u-boot.after 8055864 u-boot.before 8055960 u-boot.after
2. BIN size comparison shows no change
$ du -b u-boot.bin.before u-boot.bin.after 3377256 u-boot.bin.before 3377256 u-boot.bin.after
3. "size" tool gives more details about ELF file size increase:
$ size u-boot.before u-boot.after text data bss dec hex filename 1199720 76952 291760 1568432 17eeb0 u-boot.before 1199736 76952 291760 1568448 17eec0 u-boot.after
4. "bloaty" (diff mode) gives even more details (confirming the above)
$ bloaty -d compileunits u-boot.after -- u-boot.before
VM SIZE FILE SIZE
-------------- --------------
+2.5% +30 lib/libfdt/fdt.c +96 +1.5%
[ = ] 0 lib/libfdt/fdt_sw.c +21 +0.1%
+2.6% +16 [LOAD [RX]] +16 +2.6%
[ = ] 0 lib/libfdt/fdt_overlay.c +16 +0.1%
[ = ] 0 [section .debug_str] +2 +0.0%
[ = ] 0 fs/ext4/ext4_common.c -5 -0.0%
[ = ] 0 common/fdt_support.c -11 -0.0%
-3.3% -14 [section .text] -14 -3.3%
[ = ] 0 [Unmapped] -25 -0.7%
+0.0% +32 TOTAL +96 +0.0%Quoted 2 lines
Regards,
Simon
Best regards,
Eugeniu.
PATCH v2 4/6 scripts/dtc: Update to upstream version v1.4.6-9-gaadd0b65c987
Hi,
Quoted 102 lines · Eugeniu Rosca
Hi Simon,
Quoted 85 lines · Simon Glass
Hi,
Quoted 73 lines · Eugeniu Rosca
From: Rob Herring <[email protected]>
This adds the following commits from upstream:
aadd0b65c987checks: centralize printing of property names in failure messages88960e398907checks: centralize printing of node path incheck_msgf1879e1a50ebAdd limited read-only support for older (V2 and V3) device tree to libfdt.37dea76e9700srcpos: drop special handling of tab65893da4aee0libfdt: overlay: Add missing license962a45ca034dAvoid installing pylibfdt when dependencies are missingcd6ea1b2bea6Makefile: Split INSTALL out into INSTALL_{PROGRAM,LIB,DATA,SCRIPT}51b3a16338dfMakefile.tests: Add LIBDL make(1) variable for portability sake333d533a8f4dAttempt to auto-detect stat(1) being used if not given proper invocatione54388015af1dtc: Bump version to v1.4.6a1fe86f380cbfdtoverlay: Switch from using alloca to mallocc8d5472de3fftests: Improve compatibility with other platformsc81d389a10ccchecks: add chosen node checkse671852042a7checks: add aliases node checksd0c44ebe3f42checks: check for #{size,address}-cells without child nodes18a3d84bb802checks: add string list check for *-names properties8fe94fd6f19fchecks: add string list check6c5730819604checks: add a string check for 'label' propertya384191eba09checks: fix sound-dai phandle with arg property checkb260c4f610c0Fix ambiguous grammar for devicetree rulefe667e382bactests: Add some basic tests for thepci_bridgechecks7975f6422260Fix widespread incorrect use ofstrneq(), replace with newstrprefixeq()fca296445eabAddstrstarts()helper functioncc392f089007tests: Check non-matching cases forfdt_node_check_compatible()bba26a5291c8livetree: avoid assertion of orphan phandles with overlaysc8f8194d76ccimplement strnlen for systems that need itc8b38f65fdeclibfdt: Remove leading underscores from identifiers3b62fdaebfe5Remove leading underscores from identifiers2d45d1c5c65eReplaceFDT_VERSION()withstringify()2e6fe5a107b5Fix some errors in commentsb0ae9e4b0cebtests: Correct warning insw_tree1.cCommit
c8b38f65fdecupstream ("libfdt: Remove leading underscores from identifiers") changed the multiple inclusion define protection, so the kernel'slibfdt_env.hneeds the corresponding update.Signed-off-by Rob Herring <[email protected]>[ Linux commit: 9130ba884640328bb78aaa4840e5ddf06ccafb1c ][erosca: - Fixup conflicts in
include/linux/libfdt_env.hcaused by v2018.03-rc4
commitb08c8c487083("libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>")
- Fix build errors inlib/libfdt/fdt_ro.c,tools/libfdt/fdt_rw.cby:
- s/_fdt_mem_rsv/fdt_mem_rsv_/
- s/_fdt_offset_ptr/fdt_offset_ptr_/
- s/_fdt_check_node_offset/fdt_check_node_offset_/
- s/_fdt_check_prop_offset/fdt_check_prop_offset_/
- s/_fdt_find_add_string/fdt_find_add_string_/]Signed-off-by Eugeniu Rosca <[email protected]>---
v1-v2:
* Newly pushedinclude/linux/libfdt_env.h | 6 +- lib/libfdt/fdt_ro.c | 18 +- scripts/dtc/checks.c | 439 ++++++++++++++++++--------- scripts/dtc/dtc-parser.y | 17 +- scripts/dtc/dtc.c | 7 +- scripts/dtc/dtc.h | 11 +- scripts/dtc/flattree.c | 2 +- scripts/dtc/libfdt/fdt.c | 13 +- scripts/dtc/libfdt/fdt.h | 6 +- scripts/dtc/libfdt/fdt_overlay.c | 51 ++++ scripts/dtc/libfdt/fdt_ro.c | 132 ++++++-- scripts/dtc/libfdt/fdt_rw.c | 90 +++--- scripts/dtc/libfdt/fdt_sw.c | 24 +- scripts/dtc/libfdt/fdt_wip.c | 10 +- scripts/dtc/libfdt/libfdt.h | 37 +-- scripts/dtc/libfdt/libfdt_env.h | 33 +-Quoted 8 lines
scripts/dtc/libfdt/libfdt_internal.h | 32 +- scripts/dtc/livetree.c | 10 +- scripts/dtc/srcpos.c | 5 - scripts/dtc/srcpos.h | 6 +- scripts/dtc/util.h | 9 +- scripts/dtc/version_gen.h | 2 +- tools/libfdt/fdt_rw.c | 2 +- 23 files changed, 632 insertions(+), 330 deletions(-)Quoted 1 line
Can you please check that this does not adversely impact code size?
Sure. Here are the sizes before and after this patch (sandbox):
1. ELF size comparison shows 96 bytes increase
$ du -b u-boot.before u-boot.after 8055864 u-boot.before 8055960 u-boot.after2. BIN size comparison shows no change
$ du -b u-boot.bin.before u-boot.bin.after 3377256 u-boot.bin.before 3377256 u-boot.bin.after
Quoted 5 lines
3. "size" tool gives more details about ELF file size increase:
$ size u-boot.before u-boot.after text data bss dec hex filename 1199720 76952 291760 1568432 17eeb0 u-boot.before 1199736 76952 291760 1568448 17eec0 u-boot.after
Thanks for the info. That seems OK, but please check sandbox_spl (or better yet one of the Thumb2 SPL images that uses libfdt) since it is SPL that matters most.
Quoted 15 lines
4. "bloaty" (diff mode) gives even more details (confirming the above)
$ bloaty -d compileunits u-boot.after -- u-boot.before VM SIZE FILE SIZE -------------- -------------- +2.5% +30 lib/libfdt/fdt.c +96 +1.5% [ = ] 0 lib/libfdt/fdt_sw.c +21 +0.1% +2.6% +16 [LOAD [RX]] +16 +2.6% [ = ] 0 lib/libfdt/fdt_overlay.c +16 +0.1% [ = ] 0 [section .debug_str] +2 +0.0% [ = ] 0 fs/ext4/ext4_common.c -5 -0.0% [ = ] 0 common/fdt_support.c -11 -0.0% -3.3% -14 [section .text] -14 -3.3% [ = ] 0 [Unmapped] -25 -0.7% +0.0% +32 TOTAL +96 +0.0%
BTW buildman has a -B flag that shows function size.
Regards,
Simon
PATCH v2 4/6 scripts/dtc: Update to upstream version v1.4.6-9-gaadd0b65c987
Hi Simon,
Quoted 28 lines · Simon Glass
Hi,
Quoted 19 lines · Eugeniu Rosca
Hi Simon,
Quoted 3 lines · Simon Glass
Hi,
Can you please check that this does not adversely impact code size?
Sure. Here are the sizes before and after this patch (sandbox):
1. ELF size comparison shows 96 bytes increase
$ du -b u-boot.before u-boot.after 8055864 u-boot.before 8055960 u-boot.after2. BIN size comparison shows no change
$ du -b u-boot.bin.before u-boot.bin.after 3377256 u-boot.bin.before 3377256 u-boot.bin.afterQuoted 5 lines
3. "size" tool gives more details about ELF file size increase:
$ size u-boot.before u-boot.after text data bss dec hex filename 1199720 76952 291760 1568432 17eeb0 u-boot.before 1199736 76952 291760 1568448 17eec0 u-boot.after
Quoted 3 lines
Thanks for the info. That seems OK, but please check
sandbox_spl(or better yet one of the Thumb2 SPL images that uses libfdt) since it is SPL that matters most.
I am having issues bringing up buildman on my host, so I just went through the same procedure of building before and after using make and comparing the ELF/BIN size for:
1. sandbox_spl_defconfig
2. x600_defconfig
There is no drastic change to previous results.
1.1 sandbox_spl_defconfig ELF size increase: 7394784-7394712 = 72 bytes. 1.2 sandbox_spl_defconfig BIN size increase: 3298280-3298280 = 0 bytes.
2.1 x600_defconfig ELF size increase: 3766144-3766232 = 88 bytes. 2.2 x600_defconfig BIN size increase: 439288-439240 = 48 bytes.
Quoted 16 lines
Quoted 15 lines
4. "bloaty" (diff mode) gives even more details (confirming the above)
$ bloaty -d compileunits u-boot.after -- u-boot.before VM SIZE FILE SIZE -------------- -------------- +2.5% +30 lib/libfdt/fdt.c +96 +1.5% [ = ] 0 lib/libfdt/fdt_sw.c +21 +0.1% +2.6% +16 [LOAD [RX]] +16 +2.6% [ = ] 0 lib/libfdt/fdt_overlay.c +16 +0.1% [ = ] 0 [section .debug_str] +2 +0.0% [ = ] 0 fs/ext4/ext4_common.c -5 -0.0% [ = ] 0 common/fdt_support.c -11 -0.0% -3.3% -14 [section .text] -14 -3.3% [ = ] 0 [Unmapped] -25 -0.7% +0.0% +32 TOTAL +96 +0.0%
Quoted 1 line
BTW buildman has a -B flag that shows function size.
Thanks for the tip. The nice thing about bloaty is that it provides both VM and FILE size numbers. I am not sure if buildman can do the same. Anyway, this was helpful and is expected to save time on my end when I manage to bring it up.
Quoted 3 lines
Regards,
Simon
Regards,
Eugeniu.
PATCH v2 4/6 scripts/dtc: Update to upstream version v1.4.6-9-gaadd0b65c987
Hi,
Quoted 41 lines · Eugeniu Rosca
Hi Simon,
Quoted 28 lines · Simon Glass
Hi,
Quoted 19 lines · Eugeniu Rosca
Hi Simon,
Quoted 3 lines · Simon Glass
Hi,
Can you please check that this does not adversely impact code size?
Sure. Here are the sizes before and after this patch (sandbox):
1. ELF size comparison shows 96 bytes increase
$ du -b u-boot.before u-boot.after 8055864 u-boot.before 8055960 u-boot.after2. BIN size comparison shows no change
$ du -b u-boot.bin.before u-boot.bin.after 3377256 u-boot.bin.before 3377256 u-boot.bin.afterQuoted 5 lines
3. "size" tool gives more details about ELF file size increase:
$ size u-boot.before u-boot.after text data bss dec hex filename 1199720 76952 291760 1568432 17eeb0 u-boot.before 1199736 76952 291760 1568448 17eec0 u-boot.afterQuoted 3 lines
Thanks for the info. That seems OK, but please check
sandbox_spl(or better yet one of the Thumb2 SPL images that uses libfdt) since it is SPL that matters most.I am having issues bringing up buildman on my host, so I just went through the same procedure of building before and after using make and comparing the ELF/BIN size for:
1.sandbox_spl_defconfig
2.x600_defconfig
Quoted 8 lines
There is no drastic change to previous results.
1.1
sandbox_spl_defconfigELF size increase: 7394784-7394712 = 72 bytes. 1.2sandbox_spl_defconfigBIN size increase: 3298280-3298280 = 0 bytes.2.1
x600_defconfigELF size increase: 3766144-3766232 = 88 bytes. 2.2x600_defconfigBIN size increase: 439288-439240 = 48 bytes.
OK
Quoted 16 lines
Quoted 16 lines
Quoted 15 lines
4. "bloaty" (diff mode) gives even more details (confirming the above)
$ bloaty -d compileunits u-boot.after -- u-boot.before VM SIZE FILE SIZE -------------- -------------- +2.5% +30 lib/libfdt/fdt.c +96 +1.5% [ = ] 0 lib/libfdt/fdt_sw.c +21 +0.1% +2.6% +16 [LOAD [RX]] +16 +2.6% [ = ] 0 lib/libfdt/fdt_overlay.c +16 +0.1% [ = ] 0 [section .debug_str] +2 +0.0% [ = ] 0 fs/ext4/ext4_common.c -5 -0.0% [ = ] 0 common/fdt_support.c -11 -0.0% -3.3% -14 [section .text] -14 -3.3% [ = ] 0 [Unmapped] -25 -0.7% +0.0% +32 TOTAL +96 +0.0%
Quoted 6 lines
Quoted 1 line
BTW buildman has a -B flag that shows function size.
Thanks for the tip. The nice thing about bloaty is that it provides both VM and FILE size numbers. I am not sure if buildman can do the same. Anyway, this was helpful and is expected to save time on my end when I manage to bring it up.
I am not sure that the file size numbers are very useful though, since we mostly care about the text and data size.
Regards,
Simon
PATCH v2 4/6 scripts/dtc: Update to upstream version v1.4.6-9-gaadd0b65c987
In reply to Eugeniu Rosca2018-05-13 2:13 GMT+09:00 Eugeniu Rosca <[email protected]>:
Quoted 51 lines
From: Rob Herring <[email protected]>
This adds the following commits from upstream:
aadd0b65c987checks: centralize printing of property names in failure messages88960e398907checks: centralize printing of node path incheck_msgf1879e1a50ebAdd limited read-only support for older (V2 and V3) device tree to libfdt.37dea76e9700srcpos: drop special handling of tab65893da4aee0libfdt: overlay: Add missing license962a45ca034dAvoid installing pylibfdt when dependencies are missingcd6ea1b2bea6Makefile: Split INSTALL out into INSTALL_{PROGRAM,LIB,DATA,SCRIPT}51b3a16338dfMakefile.tests: Add LIBDL make(1) variable for portability sake333d533a8f4dAttempt to auto-detect stat(1) being used if not given proper invocatione54388015af1dtc: Bump version to v1.4.6a1fe86f380cbfdtoverlay: Switch from using alloca to mallocc8d5472de3fftests: Improve compatibility with other platformsc81d389a10ccchecks: add chosen node checkse671852042a7checks: add aliases node checksd0c44ebe3f42checks: check for #{size,address}-cells without child nodes18a3d84bb802checks: add string list check for *-names properties8fe94fd6f19fchecks: add string list check6c5730819604checks: add a string check for 'label' propertya384191eba09checks: fix sound-dai phandle with arg property checkb260c4f610c0Fix ambiguous grammar for devicetree rulefe667e382bactests: Add some basic tests for thepci_bridgechecks7975f6422260Fix widespread incorrect use ofstrneq(), replace with newstrprefixeq()fca296445eabAddstrstarts()helper functioncc392f089007tests: Check non-matching cases forfdt_node_check_compatible()bba26a5291c8livetree: avoid assertion of orphan phandles with overlaysc8f8194d76ccimplement strnlen for systems that need itc8b38f65fdeclibfdt: Remove leading underscores from identifiers3b62fdaebfe5Remove leading underscores from identifiers2d45d1c5c65eReplaceFDT_VERSION()withstringify()2e6fe5a107b5Fix some errors in commentsb0ae9e4b0cebtests: Correct warning insw_tree1.cCommit
c8b38f65fdecupstream ("libfdt: Remove leading underscores from identifiers") changed the multiple inclusion define protection, so the kernel'slibfdt_env.hneeds the corresponding update.Signed-off-by Rob Herring <[email protected]>[ Linux commit: 9130ba884640328bb78aaa4840e5ddf06ccafb1c ][erosca: - Fixup conflicts in
include/linux/libfdt_env.hcaused by v2018.03-rc4
commitb08c8c487083("libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>")
- Fix build errors inlib/libfdt/fdt_ro.c,tools/libfdt/fdt_rw.cby:
- s/_fdt_mem_rsv/fdt_mem_rsv_/
- s/_fdt_offset_ptr/fdt_offset_ptr_/
- s/_fdt_check_node_offset/fdt_check_node_offset_/
- s/_fdt_check_prop_offset/fdt_check_prop_offset_/
- s/_fdt_find_add_string/fdt_find_add_string_/]
Quoted 2 lines
Signed-off-by Eugeniu Rosca <[email protected]>---
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH v2 5/6 scripts/dtc: Re-sync with Linux 4.17-rc4
In reply to Eugeniu RoscaTo achieve a DTC state (more or less) equivalent to Linux 4.17-rc4, backport the DTC-specific part from below Linux commits:
b23d1a241f4eb4 ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically") 9a8dfb394c0467 ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile") 59889300274569 (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore") e039139be8c251 ("scripts/dtc: generate lexer and parser during build instead of shipping") b24413180f5600 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license")
With this commit, the diff between Linux and U-boot common DTC files is:
$ git diff --stat --diff-filter=M v4.17-rc4 <this-commit> -- scripts/dtc scripts/dtc/.gitignore | 2 +- scripts/dtc/Makefile | 3 +++
The delta is coming from U-boot commits:
* v2017.11 de163ecedb8a ("scripts: dtc: Add .gitignore")
* v2018.01 15b97f5c5e6d ("pylibfdt: move pylibfdt to scripts/dtc/pylibfdt and refactor makefile")
---
v1->v2:
* Newly pushed
scripts/dtc/.gitignore | 3 - scripts/dtc/Makefile | 4 +- scripts/dtc/dtc-lexer.lex.c_shipped | 2259 ------------------------- scripts/dtc/dtc-parser.tab.c_shipped | 2321 -------------------------- scripts/dtc/dtc-parser.tab.h_shipped | 125 -- scripts/dtc/update-dtc-source.sh | 8 +- 6 files changed, 3 insertions(+), 4717 deletions(-) delete mode 100644 scripts/dtc/dtc-lexer.lex.c_shipped delete mode 100644 scripts/dtc/dtc-parser.tab.c_shipped delete mode 100644 scripts/dtc/dtc-parser.tab.h_shipped
scripts/dtc/.gitignore +0 -3
@@ -1,4 +1 @@ /dtc -/dtc-lexer.lex.c -/dtc-parser.tab.c -/dtc-parser.tab.h
scripts/dtc/Makefile +1 -3
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # scripts/dtc makefile hostprogs-y := dtc
@@ -27,8 +28,5 @@ HOSTCFLAGS_dtc-parser.tab.o := $(HOSTCFLAGS_DTC) # dependencies on generated files need to be listed explicitly $(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.h -# generated files need to be cleaned explicitly -clean-files := dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h - # Added for U-Boot subdir-$(CONFIG_PYLIBFDT) += pylibfdt
scripts/dtc/dtc-lexer.lex.c_shipped deleted +0 -2259
2,259 lines not on this page · raw message
scripts/dtc/dtc-parser.tab.c_shipped deleted +0 -2321
725 lines not on this page · raw message
scripts/dtc/dtc-parser.tab.h_shipped deleted +0 -125
125 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.17.0
Part of the diff is not shown here. View the raw message.
PATCH v2 5/6 scripts/dtc: Re-sync with Linux 4.17-rc4
Dear Masahiro, Simon,
I think this patch logically belongs and is tightly coupled to the Linux 4.17-rc4 Kconfig re-sync. Since you skipped it, I wonder if you have a different view on this.
Most of the Linux commits imported here are actually DTC-specific pieces from the Linux commits squashed into Kconfig re-sync patch. The idea of doing that is to create a patch whose scope is limited to DTC. I could have kept the integrity of Linux commits, which would have extended the Kconfig re-sync patch to DTC as well. I still can take a different approach, depending on your feedback. Filtering out this patch doesn't sound good to me. TIA for your input.
Regards,
Eugeniu.
Quoted 4,824 lines · Eugeniu Rosca
To achieve a DTC state (more or less) equivalent to Linux 4.17-rc4, backport the DTC-specific part from below Linux commits:
b23d1a241f4eb4("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically")9a8dfb394c0467("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-levelMakefile") 59889300274569 (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore")e039139be8c251("scripts/dtc: generate lexer and parser during build instead of shipping")b24413180f5600("License cleanup: add SPDX GPL-2.0 license identifier to files with no license")With this commit, the diff between Linux and U-boot common DTC files is:
$ git diff --stat --diff-filter=M v4.17-rc4 <this-commit> -- scripts/dtc scripts/dtc/.gitignore | 2 +- scripts/dtc/Makefile | 3 +++The delta is coming from U-boot commits:
* v2017.11de163ecedb8a("scripts: dtc: Add .gitignore")
* v2018.0115b97f5c5e6d("pylibfdt: move pylibfdt toscripts/dtc/pylibfdtand refactor makefile")Signed-off-by Eugeniu Rosca <[email protected]>---
v1->v2:
* Newly pushedscripts/dtc/.gitignore | 3 - scripts/dtc/Makefile | 4 +- scripts/dtc/dtc-lexer.lex.c_shipped | 2259 ------------------------- scripts/dtc/dtc-parser.tab.c_shipped | 2321 -------------------------- scripts/dtc/dtc-parser.tab.h_shipped | 125 -- scripts/dtc/update-dtc-source.sh | 8 +- 6 files changed, 3 insertions(+), 4717 deletions(-) delete mode 100644 scripts/dtc/dtc-lexer.lex.c_shipped delete mode 100644 scripts/dtc/dtc-parser.tab.c_shipped delete mode 100644 scripts/dtc/dtc-parser.tab.h_shippedscripts/dtc/.gitignore +0
-3@@ -1,4 +1 @@ /dtc -/dtc-lexer.lex.c -/dtc-parser.tab.c -/dtc-parser.tab.hscripts/dtc/Makefile +1
-3@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # scripts/dtc makefile hostprogs-y := dtc@@ -27,8 +28,5 @@ HOSTCFLAGS_dtc-parser.tab.o := $(HOSTCFLAGS_DTC) # dependencies on generated files need to be listed explicitly $(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.h -# generated files need to be cleaned explicitly -clean-files := dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h - # Added for U-Boot subdir-$(CONFIG_PYLIBFDT) += pylibfdtscripts/dtc/dtc-lexer.lex.c_shipped deleted +0
-2259@@ -1,2259 +0,0 @@ -#line 2 "dtc-lexer.lex.c" - -#line 4 "dtc-lexer.lex.c" - -#define YY_INT_ALIGNED short int - -/* A lexical scanner generated by flex */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 1 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ -#include <stdio.h> -#include <string.h> -#include <errno.h> -#include <stdlib.h> - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include <inttypes.h> -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#endif /* ! C99 */ - -#endif /* ! FLEXINT_H */ - -/* TODO: this is always defined, so inline it */ -#define yyconst const - -#if defined(__GNUC__) && __GNUC__ >= 3 -#define yynoreturn __attribute__((__noreturn__)) -#else -#define yynoreturn -#endif - -/* Returned upon end-of-file. */ -#define YY_NULL 0 - -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. - */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) - -/* Enter a start condition. This macro really ought to take a parameter, - * but we do it the disgusting crufty way forced on us by the ()-less - * definition of BEGIN. - */ -#define BEGIN (yy_start) = 1 + 2 * - -/* Translate the current start state into a value that can be later handed - * to BEGIN to return to the state. The YYSTATE alias is for lex - * compatibility. - */ -#define YY_START (((yy_start) - 1) / 2) -#define YYSTATE YY_START - -/* Action number for EOF rule of a given start state. */ -#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - -/* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - -#define YY_END_OF_BUFFER_CHAR 0 - -/* Size of default input buffer. */ -#ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else -#define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ -#endif - -/* The state buf must be large enough to hold one state per character in the main buffer. - */ -#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) - -#ifndef YY_TYPEDEF_YY_BUFFER_STATE -#define YY_TYPEDEF_YY_BUFFER_STATE -typedef struct yy_buffer_state *YY_BUFFER_STATE; -#endif - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -extern int yyleng; - -extern FILE *yyin, *yyout; - -#define EOB_ACT_CONTINUE_SCAN 0 -#define EOB_ACT_END_OF_FILE 1 -#define EOB_ACT_LAST_MATCH 2 - - #define YY_LESS_LINENO(n) - #define YY_LINENO_REWIND_TO(ptr) - -/* Return all but the first "n" matched characters back to the input stream. */ -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - *yy_cp = (yy_hold_char); \ - YY_RESTORE_YY_MORE_OFFSET \ - (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up yytext again */ \ - } \ - while ( 0 ) - -#define unput(c) yyunput( c, (yytext_ptr) ) - -#ifndef YY_STRUCT_YY_BUFFER_STATE -#define YY_STRUCT_YY_BUFFER_STATE -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - int yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - int yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; - -#define YY_BUFFER_NEW 0 -#define YY_BUFFER_NORMAL 1 - /* When an EOF's been seen but there's still some text to process - * then we mark the buffer as YY_EOF_PENDING, to indicate that we - * shouldn't try reading from the input source any more. We might - * still have a bunch of tokens to match, though, because of - * possible backing-up. - * - * When we actually see the EOF, we change the status to "new" - * (via yyrestart()), so that the user can continue scanning by - * just pointing yyin at a new input file. - */ -#define YY_BUFFER_EOF_PENDING 2 - - }; -#endif /* !YY_STRUCT_YY_BUFFER_STATE */ - -/* Stack of input buffers. */ -static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ -static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ - -/* We provide macros for accessing buffer states in case in the - * future we want to put the buffer states in a more general - * "scanner state". - * - * Returns the top of the stack, or NULL. - */ -#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ - ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ - : NULL) - -/* Same as previous macro, but useful when we know that the buffer stack is not - * NULL or when we need an lvalue. For internal use only. - */ -#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] - -/* yy_hold_char holds the character lost when yytext is formed. */ -static char yy_hold_char; -static int yy_n_chars; /* number of characters read into yy_ch_buf */ -int yyleng; - -/* Points to current character in buffer. */ -static char *yy_c_buf_p = NULL; -static int yy_init = 0; /* whether we need to initialize */ -static int yy_start = 0; /* start state number */ - -/* Flag which is used to allow yywrap()'s to do buffer switches - * instead of setting up a fresh yyin. A bit of a hack ... - */ -static int yy_did_buffer_switch_on_eof; - -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); - -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) - -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); - -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); - -#define yy_new_buffer yy_create_buffer - -#define yy_set_interactive(is_interactive) \ - { \ - if ( ! YY_CURRENT_BUFFER ){ \ - yyensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ - } - -#define yy_set_bol(at_bol) \ - { \ - if ( ! YY_CURRENT_BUFFER ){\ - yyensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ - } - -#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) - -/* Begin user sect3 */ - -#define yywrap() (/*CONSTCOND*/1) -#define YY_SKIP_YYWRAP - -typedef unsigned char YY_CHAR; - -FILE *yyin = NULL, *yyout = NULL; - -typedef int yy_state_type; - -extern int yylineno; - -int yylineno = 1; - -extern char *yytext; -#ifdef yytext_ptr -#undef yytext_ptr -#endif -#define yytext_ptr yytext - -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yynoreturn yy_fatal_error (yyconst char* msg ); - -/* Done after the current pattern has been matched and before the - * corresponding action - sets up yytext. - */ -#define YY_DO_BEFORE_ACTION \ - (yytext_ptr) = yy_bp; \ - yyleng = (int) (yy_cp - yy_bp); \ - (yy_hold_char) = *yy_cp; \ - *yy_cp = '\0'; \ - (yy_c_buf_p) = yy_cp; - -#define YY_NUM_RULES 31 -#define YY_END_OF_BUFFER 32 -/* This struct is not used in this scanner, - but its presence is necessary. */ -struct yy_trans_info - { - flex_int32_t yy_verify; - flex_int32_t yy_nxt; - }; -static yyconst flex_int16_t yy_accept[166] = - { 0, - 0, 0, 0, 0, 0, 0, 0, 0, 32, 30, - 19, 19, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 16, 17, 17, 30, - 17, 11, 11, 19, 27, 0, 3, 0, 28, 13, - 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, - 0, 22, 24, 26, 25, 23, 0, 10, 29, 0, - 0, 0, 15, 15, 17, 17, 17, 11, 11, 11, - 0, 13, 0, 12, 0, 0, 0, 21, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 17, 11, 11, - 11, 0, 14, 20, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 17, 7, 0, 0, 0, - 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 4, 18, 0, 0, 5, 2, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 0, 6, 9, 0, - 0, 0, 0, 8, 0 - } ; - -static yyconst YY_CHAR yy_ec[256] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, - 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 5, 6, 7, 1, 1, 8, 9, 1, - 1, 10, 11, 11, 12, 11, 13, 14, 15, 16, - 16, 16, 16, 16, 16, 16, 16, 17, 1, 18, - 19, 20, 11, 11, 21, 21, 21, 21, 21, 21, - 22, 22, 22, 22, 22, 23, 22, 22, 22, 22, - 22, 22, 22, 22, 24, 22, 22, 25, 22, 22, - 1, 26, 27, 1, 22, 1, 21, 28, 29, 30, - - 31, 21, 32, 22, 33, 22, 22, 34, 35, 36, - 37, 38, 22, 39, 40, 41, 42, 43, 22, 25, - 44, 22, 45, 46, 47, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 - } ; - -static yyconst YY_CHAR yy_meta[48] = - { 0, - 1, 1, 1, 1, 1, 1, 2, 3, 1, 2, - 2, 2, 4, 5, 5, 5, 6, 1, 1, 1, - 7, 8, 8, 8, 8, 1, 1, 7, 7, 7, - 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 3, 1, 4 - } ; - -static yyconst flex_uint16_t yy_base[180] = - { 0, - 0, 393, 35, 392, 66, 391, 38, 107, 397, 401, - 55, 113, 377, 112, 111, 111, 114, 42, 376, 106, - 377, 347, 126, 120, 0, 147, 401, 0, 124, 0, - 137, 158, 170, 163, 401, 153, 401, 389, 401, 0, - 378, 120, 401, 131, 380, 386, 355, 139, 351, 355, - 351, 401, 401, 401, 401, 401, 367, 401, 401, 185, - 350, 346, 401, 364, 0, 185, 347, 189, 356, 355, - 0, 0, 330, 180, 366, 141, 372, 361, 332, 338, - 331, 341, 334, 326, 205, 331, 337, 329, 401, 341, - 167, 316, 401, 349, 348, 320, 328, 346, 180, 318, - - 324, 209, 324, 320, 322, 342, 338, 309, 306, 315, - 305, 315, 312, 192, 342, 341, 401, 293, 306, 282, - 268, 252, 255, 203, 285, 282, 272, 268, 252, 233, - 232, 239, 208, 107, 401, 401, 238, 211, 401, 211, - 212, 208, 228, 203, 215, 207, 233, 222, 212, 211, - 203, 227, 401, 237, 225, 204, 185, 401, 401, 149, - 128, 88, 42, 401, 401, 253, 259, 267, 271, 275, - 281, 288, 292, 300, 308, 312, 318, 326, 334 - } ; - -static yyconst flex_int16_t yy_def[180] = - { 0, - 165, 1, 1, 3, 165, 5, 1, 1, 165, 165, - 165, 165, 165, 166, 167, 168, 165, 165, 165, 165, - 169, 165, 165, 165, 170, 169, 165, 171, 172, 171, - 171, 165, 165, 165, 165, 166, 165, 166, 165, 173, - 165, 168, 165, 168, 174, 175, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 165, 169, 165, 165, 165, - 165, 165, 165, 169, 171, 172, 171, 165, 165, 165, - 176, 173, 177, 168, 174, 174, 175, 165, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 171, 165, 165, - 176, 177, 165, 165, 165, 165, 165, 165, 165, 165, - - 165, 165, 165, 165, 171, 165, 165, 165, 165, 165, - 165, 165, 165, 178, 165, 171, 165, 165, 165, 165, - 165, 165, 165, 178, 165, 178, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 179, 165, 165, - 165, 179, 165, 179, 165, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 0, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 165, 165 - } ; - -static yyconst flex_uint16_t yy_nxt[449] = - { 0, - 10, 11, 12, 11, 13, 14, 10, 15, 16, 10, - 10, 10, 17, 10, 10, 10, 10, 18, 19, 20, - 21, 21, 21, 21, 21, 10, 10, 21, 21, 21, - 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - 21, 21, 21, 21, 10, 22, 10, 24, 25, 25, - 25, 32, 33, 33, 164, 26, 34, 34, 34, 52, - 53, 27, 26, 26, 26, 26, 10, 11, 12, 11, - 13, 14, 28, 15, 16, 28, 28, 28, 24, 28, - 28, 28, 10, 18, 19, 20, 29, 29, 29, 29, - 29, 30, 10, 29, 29, 29, 29, 29, 29, 29, - - 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, - 10, 22, 10, 23, 34, 34, 34, 37, 39, 43, - 32, 33, 33, 45, 55, 56, 46, 60, 43, 45, - 65, 163, 46, 65, 65, 65, 44, 38, 60, 74, - 58, 47, 141, 48, 142, 44, 49, 47, 50, 48, - 76, 51, 62, 94, 50, 41, 44, 51, 37, 61, - 64, 64, 64, 58, 34, 34, 34, 64, 162, 80, - 67, 68, 68, 68, 64, 64, 64, 64, 38, 81, - 69, 70, 71, 68, 68, 68, 60, 161, 43, 69, - 70, 65, 69, 70, 65, 65, 65, 125, 85, 85, - - 85, 58, 68, 68, 68, 44, 102, 110, 125, 133, - 102, 69, 70, 111, 114, 160, 159, 126, 85, 85, - 85, 140, 140, 140, 140, 140, 140, 153, 126, 147, - 147, 147, 153, 148, 147, 147, 147, 158, 148, 165, - 157, 156, 155, 151, 150, 149, 146, 154, 145, 144, - 143, 139, 154, 36, 36, 36, 36, 36, 36, 36, - 36, 40, 138, 137, 136, 40, 40, 42, 42, 42, - 42, 42, 42, 42, 42, 57, 57, 57, 57, 63, - 135, 63, 65, 134, 165, 65, 133, 65, 65, 66, - 132, 131, 66, 66, 66, 66, 72, 130, 72, 72, - - 75, 75, 75, 75, 75, 75, 75, 75, 77, 77, - 77, 77, 77, 77, 77, 77, 91, 129, 91, 92, - 128, 92, 92, 127, 92, 92, 124, 124, 124, 124, - 124, 124, 124, 124, 152, 152, 152, 152, 152, 152, - 152, 152, 60, 60, 123, 122, 121, 120, 119, 118, - 117, 45, 116, 111, 115, 113, 112, 109, 108, 107, - 46, 106, 93, 89, 105, 104, 103, 101, 100, 99, - 98, 97, 96, 95, 78, 76, 93, 90, 89, 88, - 58, 87, 86, 58, 84, 83, 82, 79, 78, 76, - 73, 165, 59, 58, 54, 35, 165, 31, 23, 23, - - 9, 165, 165, 165, 165, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 165 - } ; - -static yyconst flex_int16_t yy_chk[449] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, - 3, 7, 7, 7, 163, 3, 11, 11, 11, 18, - 18, 3, 3, 3, 3, 3, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 8, 12, 12, 12, 14, 15, 16, - 8, 8, 8, 17, 20, 20, 17, 23, 42, 24, - 29, 162, 24, 29, 29, 29, 16, 14, 31, 44, - 29, 17, 134, 17, 134, 42, 17, 24, 17, 24, - 76, 17, 24, 76, 24, 15, 44, 24, 36, 23, - 26, 26, 26, 26, 34, 34, 34, 26, 161, 48, - 31, 32, 32, 32, 26, 26, 26, 26, 36, 48, - 32, 32, 32, 33, 33, 33, 60, 160, 74, 91, - 91, 66, 33, 33, 66, 66, 66, 114, 60, 60, - - 60, 66, 68, 68, 68, 74, 85, 99, 124, 133, - 102, 68, 68, 99, 102, 157, 156, 114, 85, 85, - 85, 133, 133, 133, 140, 140, 140, 148, 124, 143, - 143, 143, 152, 143, 147, 147, 147, 155, 147, 154, - 151, 150, 149, 146, 145, 144, 142, 148, 141, 138, - 137, 132, 152, 166, 166, 166, 166, 166, 166, 166, - 166, 167, 131, 130, 129, 167, 167, 168, 168, 168, - 168, 168, 168, 168, 168, 169, 169, 169, 169, 170, - 128, 170, 171, 127, 126, 171, 125, 171, 171, 172, - 123, 122, 172, 172, 172, 172, 173, 121, 173, 173, - - 174, 174, 174, 174, 174, 174, 174, 174, 175, 175, - 175, 175, 175, 175, 175, 175, 176, 120, 176, 177, - 119, 177, 177, 118, 177, 177, 178, 178, 178, 178, - 178, 178, 178, 178, 179, 179, 179, 179, 179, 179, - 179, 179, 116, 115, 113, 112, 111, 110, 109, 108, - 107, 106, 105, 104, 103, 101, 100, 98, 97, 96, - 95, 94, 92, 90, 88, 87, 86, 84, 83, 82, - 81, 80, 79, 78, 77, 75, 73, 70, 69, 67, - 64, 62, 61, 57, 51, 50, 49, 47, 46, 45, - 41, 38, 22, 21, 19, 13, 9, 6, 4, 2, - - 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 165 - } ; - -static yy_state_type yy_last_accepting_state; -static char *yy_last_accepting_cpos; - -extern int yy_flex_debug; -int yy_flex_debug = 0; - -/* The intent behind this definition is that it'll catch - * any uses of REJECT which flex missed. - */ -#define REJECT reject_used_but_not_detected -#define yymore() yymore_used_but_not_detected -#define YY_MORE_ADJ 0 -#define YY_RESTORE_YY_MORE_OFFSET -char *yytext; -#line 1 "dtc-lexer.l" -/* - * (C) Copyright David Gibson <[email protected]>, IBM Corporation. 2005. - * - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ -#define YY_NO_INPUT 1 - - - -#line 37 "dtc-lexer.l" -#include "dtc.h" -#include "srcpos.h" -#include "dtc-parser.tab.h" - -YYLTYPE yylloc; -extern bool treesource_error; - -/* CAUTION: this will stop working if we ever use yyless() or yyunput() */ -#define YY_USER_ACTION \ - { \ - srcpos_update(&yylloc, yytext, yyleng); \ - } - -/*#define LEXDEBUG 1*/ - -#ifdef LEXDEBUG -#define DPRINT(fmt, ...) fprintf(stderr, fmt, ##__VA_ARGS__) -#else -#define DPRINT(fmt, ...) do { } while (0) -#endif - -static int dts_version = 1; - -#define BEGIN_DEFAULT() DPRINT("<V1>\n"); \ - BEGIN(V1); \ - -static void push_input_file(const char *filename); -static bool pop_input_file(void); -static void PRINTF(1, 2) lexical_error(const char *fmt, ...); - -#line 661 "dtc-lexer.lex.c" - -#define INITIAL 0 -#define BYTESTRING 1 -#define PROPNODENAME 2 -#define V1 3 - -#ifndef YY_NO_UNISTD_H -/* Special case for "unistd.h", since it is non-ANSI. We include it way - * down here because we want the user's section 1 to have been scanned first. - * The user has a chance to override it with an option. - */ -#include <unistd.h> -#endif - -#ifndef YY_EXTRA_TYPE -#define YY_EXTRA_TYPE void * -#endif - -static int yy_init_globals (void ); - -/* Accessor methods to globals. - These are made visible to non-reentrant scanners for convenience. */ - -int yylex_destroy (void ); - -int yyget_debug (void ); - -void yyset_debug (int debug_flag ); - -YY_EXTRA_TYPE yyget_extra (void ); - -void yyset_extra (YY_EXTRA_TYPE user_defined ); - -FILE *yyget_in (void ); - -void yyset_in (FILE * _in_str ); - -FILE *yyget_out (void ); - -void yyset_out (FILE * _out_str ); - - int yyget_leng (void ); - -char *yyget_text (void ); - -int yyget_lineno (void ); - -void yyset_lineno (int _line_number ); - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef YY_SKIP_YYWRAP -#ifdef __cplusplus -extern "C" int yywrap (void ); -#else -extern int yywrap (void ); -#endif -#endif - -#ifndef YY_NO_UNPUT - -#endif - -#ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); -#endif - -#ifndef YY_NO_INPUT - -#ifdef __cplusplus -static int yyinput (void ); -#else -static int input (void ); -#endif - -#endif - -/* Amount of stuff to slurp up with each read. */ -#ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else -#define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ -#endif - -/* Copy whatever the last rule matched to the standard output. */ -#ifndef ECHO -/* This used to be an fputs(), but since the string might contain NUL's, - * we now use fwrite(). - */ -#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) -#endif - -/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, - * is returned in "result". - */ -#ifndef YY_INPUT -#define YY_INPUT(buf,result,max_size) \ - if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ - { \ - int c = '*'; \ - size_t n; \ - for ( n = 0; n < max_size && \ - (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ - buf[n] = (char) c; \ - if ( c == '\n' ) \ - buf[n++] = (char) c; \ - if ( c == EOF && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - result = n; \ - } \ - else \ - { \ - errno=0; \ - while ( (result = (int) fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ - { \ - if( errno != EINTR) \ - { \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - break; \ - } \ - errno=0; \ - clearerr(yyin); \ - } \ - }\ -\ - -#endif - -/* No semi-colon after return; correct usage is to write "yyterminate();" - - * we don't want an extra ';' after the "return" because that will cause - * some compilers to complain about unreachable statements. - */ -#ifndef yyterminate -#define yyterminate() return YY_NULL -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef YY_START_STACK_INCR -#define YY_START_STACK_INCR 25 -#endif - -/* Report a fatal error. */ -#ifndef YY_FATAL_ERROR -#define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) -#endif - -/* end tables serialization structures and prototypes */ - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef YY_DECL -#define YY_DECL_IS_OURS 1 - -extern int yylex (void); - -#define YY_DECL int yylex (void) -#endif /* !YY_DECL */ - -/* Code executed at the beginning of each rule, after yytext and yyleng - * have been set up. - */ -#ifndef YY_USER_ACTION -#define YY_USER_ACTION -#endif - -/* Code executed at the end of each rule. */ -#ifndef YY_BREAK -#define YY_BREAK /*LINTED*/break; -#endif - -#define YY_RULE_SETUP \ - if ( yyleng > 0 ) \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \ - (yytext[yyleng - 1] == '\n'); \ - YY_USER_ACTION - -/** The main scanner function which does all the work. - */ -YY_DECL -{ - yy_state_type yy_current_state; - char *yy_cp, *yy_bp; - int yy_act; - - if ( !(yy_init) ) - { - (yy_init) = 1; - -#ifdef YY_USER_INIT - YY_USER_INIT; -#endif - - if ( ! (yy_start) ) - (yy_start) = 1; /* first start state */ - - if ( ! yyin ) - yyin = stdin; - - if ( ! yyout ) - yyout = stdout; - - if ( ! YY_CURRENT_BUFFER ) { - yyensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); - } - - yy_load_buffer_state( ); - } - - { -#line 69 "dtc-lexer.l" - -#line 885 "dtc-lexer.lex.c" - - while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ - { - yy_cp = (yy_c_buf_p); - - /* Support of yytext. */ - *yy_cp = (yy_hold_char); - - /* yy_bp points to the position in yy_ch_buf of the start of - * the current run. - */ - yy_bp = yy_cp; - - yy_current_state = (yy_start); - yy_current_state += YY_AT_BOL(); -yy_match: - do - { - YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 166 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; - ++yy_cp; - } - while ( yy_current_state != 165 ); - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); - -yy_find_action: - yy_act = yy_accept[yy_current_state]; - - YY_DO_BEFORE_ACTION; - -do_action: /* This label is used only to access EOF actions. */ - - switch ( yy_act ) - { /* beginning of action switch */ - case 0: /* must back up */ - /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = (yy_hold_char); - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); - goto yy_find_action; - -case 1: -/* rule 1 can match eol */ -YY_RULE_SETUP -#line 70 "dtc-lexer.l" -{ - char *name = strchr(yytext, '\"') + 1; - yytext[yyleng-1] = '\0'; - push_input_file(name); - } - YY_BREAK -case 2: -/* rule 2 can match eol */ -YY_RULE_SETUP -#line 76 "dtc-lexer.l" -{ - char *line, *fnstart, *fnend; - struct data fn; - /* skip text before line # */ - line = yytext; - while (!isdigit((unsigned char)*line)) - line++; - - /* regexp ensures that first and list " - * in the whole yytext are those at - * beginning and end of the filename string */ - fnstart = memchr(yytext, '"', yyleng); - for (fnend = yytext + yyleng - 1; - *fnend != '"'; fnend--) - ; - assert(fnstart && fnend && (fnend > fnstart)); - - fn = data_copy_escape_string(fnstart + 1, - fnend - fnstart - 1); - - /* Don't allow nuls in filenames */ - if (memchr(fn.val, '\0', fn.len - 1)) - lexical_error("nul in line number directive"); - - /* -1 since #line is the number of the next line */ - srcpos_set_line(xstrdup(fn.val), atoi(line) - 1); - data_free(fn); - } - YY_BREAK -case YY_STATE_EOF(INITIAL): -case YY_STATE_EOF(BYTESTRING): -case YY_STATE_EOF(PROPNODENAME): -case YY_STATE_EOF(V1): -#line 105 "dtc-lexer.l" -{ - if (!pop_input_file()) { - yyterminate(); - } - } - YY_BREAK -case 3: -/* rule 3 can match eol */ -YY_RULE_SETUP -#line 111 "dtc-lexer.l" -{ - DPRINT("String: %s\n", yytext); - yylval.data = data_copy_escape_string(yytext+1, - yyleng-2); - return DT_STRING; - } - YY_BREAK -case 4: -YY_RULE_SETUP -#line 118 "dtc-lexer.l" -{ - DPRINT("Keyword: /dts-v1/\n"); - dts_version = 1; - BEGIN_DEFAULT(); - return DT_V1; - } - YY_BREAK -case 5: -YY_RULE_SETUP -#line 125 "dtc-lexer.l" -{ - DPRINT("Keyword: /plugin/\n"); - return DT_PLUGIN; - } - YY_BREAK -case 6: -YY_RULE_SETUP -#line 130 "dtc-lexer.l" -{ - DPRINT("Keyword: /memreserve/\n"); - BEGIN_DEFAULT(); - return DT_MEMRESERVE; - } - YY_BREAK -case 7: -YY_RULE_SETUP -#line 136 "dtc-lexer.l" -{ - DPRINT("Keyword: /bits/\n"); - BEGIN_DEFAULT(); - return DT_BITS; - } - YY_BREAK -case 8: -YY_RULE_SETUP -#line 142 "dtc-lexer.l" -{ - DPRINT("Keyword: /delete-property/\n"); - DPRINT("<PROPNODENAME>\n"); - BEGIN(PROPNODENAME); - return DT_DEL_PROP; - } - YY_BREAK -case 9: -YY_RULE_SETUP -#line 149 "dtc-lexer.l" -{ - DPRINT("Keyword: /delete-node/\n"); - DPRINT("<PROPNODENAME>\n"); - BEGIN(PROPNODENAME); - return DT_DEL_NODE; - } - YY_BREAK -case 10: -YY_RULE_SETUP -#line 156 "dtc-lexer.l" -{ - DPRINT("Label: %s\n", yytext); - yylval.labelref = xstrdup(yytext); - yylval.labelref[yyleng-1] = '\0'; - return DT_LABEL; - } - YY_BREAK -case 11: -YY_RULE_SETUP -#line 163 "dtc-lexer.l" -{ - char *e; - DPRINT("Integer Literal: '%s'\n", yytext); - - errno = 0; - yylval.integer = strtoull(yytext, &e, 0); - - if (*e && e[strspn(e, "UL")]) { - lexical_error("Bad integer literal '%s'", - yytext); - } - - if (errno == ERANGE) - lexical_error("Integer literal '%s' out of range", - yytext); - else - /* ERANGE is the only strtoull error triggerable - * by strings matching the pattern */ - assert(errno == 0); - return DT_LITERAL; - } - YY_BREAK -case 12: -/* rule 12 can match eol */ -YY_RULE_SETUP -#line 185 "dtc-lexer.l" -{ - struct data d; - DPRINT("Character literal: %s\n", yytext); - - d = data_copy_escape_string(yytext+1, yyleng-2); - if (d.len == 1) { - lexical_error("Empty character literal"); - yylval.integer = 0; - } else { - yylval.integer = (unsigned char)d.val[0]; - - if (d.len > 2) - lexical_error("Character literal has %d" - " characters instead of 1", - d.len - 1); - } - - data_free(d); - return DT_CHAR_LITERAL; - } - YY_BREAK -case 13: -YY_RULE_SETUP -#line 206 "dtc-lexer.l" -{ /* label reference */ - DPRINT("Ref: %s\n", yytext+1); - yylval.labelref = xstrdup(yytext+1); - return DT_REF; - } - YY_BREAK -case 14: -YY_RULE_SETUP -#line 212 "dtc-lexer.l" -{ /* new-style path reference */ - yytext[yyleng-1] = '\0'; - DPRINT("Ref: %s\n", yytext+2); - yylval.labelref = xstrdup(yytext+2); - return DT_REF; - } - YY_BREAK -case 15: -YY_RULE_SETUP -#line 219 "dtc-lexer.l" -{ - yylval.byte = strtol(yytext, NULL, 16); - DPRINT("Byte: %02x\n", (int)yylval.byte); - return DT_BYTE; - } - YY_BREAK -case 16: -YY_RULE_SETUP -#line 225 "dtc-lexer.l" -{ - DPRINT("/BYTESTRING\n"); - BEGIN_DEFAULT(); - return ']'; - } - YY_BREAK -case 17: -YY_RULE_SETUP -#line 231 "dtc-lexer.l" -{ - DPRINT("PropNodeName: %s\n", yytext); - yylval.propnodename = xstrdup((yytext[0] == '\\') ? - yytext + 1 : yytext); - BEGIN_DEFAULT(); - return DT_PROPNODENAME; - } - YY_BREAK -case 18: -YY_RULE_SETUP -#line 239 "dtc-lexer.l" -{ - DPRINT("Binary Include\n"); - return DT_INCBIN; - } - YY_BREAK -case 19: -/* rule 19 can match eol */ -YY_RULE_SETUP -#line 244 "dtc-lexer.l" -/* eat whitespace */ - YY_BREAK -case 20: -/* rule 20 can match eol */ -YY_RULE_SETUP -#line 245 "dtc-lexer.l" -/* eat C-style comments */ - YY_BREAK -case 21: -/* rule 21 can match eol */ -YY_RULE_SETUP -#line 246 "dtc-lexer.l" -/* eat C++-style comments */ - YY_BREAK -case 22: -YY_RULE_SETUP -#line 248 "dtc-lexer.l" -{ return DT_LSHIFT; }; - YY_BREAK -case 23: -YY_RULE_SETUP -#line 249 "dtc-lexer.l" -{ return DT_RSHIFT; }; - YY_BREAK -case 24: -YY_RULE_SETUP -#line 250 "dtc-lexer.l" -{ return DT_LE; }; - YY_BREAK -case 25: -YY_RULE_SETUP -#line 251 "dtc-lexer.l" -{ return DT_GE; }; - YY_BREAK -case 26: -YY_RULE_SETUP -#line 252 "dtc-lexer.l" -{ return DT_EQ; }; - YY_BREAK -case 27: -YY_RULE_SETUP -#line 253 "dtc-lexer.l" -{ return DT_NE; }; - YY_BREAK -case 28: -YY_RULE_SETUP -#line 254 "dtc-lexer.l" -{ return DT_AND; }; - YY_BREAK -case 29: -YY_RULE_SETUP -#line 255 "dtc-lexer.l" -{ return DT_OR; }; - YY_BREAK -case 30: -YY_RULE_SETUP -#line 257 "dtc-lexer.l" -{ - DPRINT("Char: %c (\\x%02x)\n", yytext[0], - (unsigned)yytext[0]); - if (yytext[0] == '[') { - DPRINT("<BYTESTRING>\n"); - BEGIN(BYTESTRING); - } - if ((yytext[0] == '{') - || (yytext[0] == ';')) { - DPRINT("<PROPNODENAME>\n"); - BEGIN(PROPNODENAME); - } - return yytext[0]; - } - YY_BREAK -case 31: -YY_RULE_SETUP -#line 272 "dtc-lexer.l" -ECHO; - YY_BREAK -#line 1257 "dtc-lexer.lex.c" - - case YY_END_OF_BUFFER: - { - /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; - - /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = (yy_hold_char); - YY_RESTORE_YY_MORE_OFFSET - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) - { - /* We're scanning a new file or input source. It's - * possible that this happened because the user - * just pointed yyin at a new source and called - * yylex(). If so, then we have to assure - * consistency between YY_CURRENT_BUFFER and our - * globals. Here is the right place to do so, because - * this is the first action (other than possibly a - * back-up) that will match for the new input source. - */ - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; - } - - /* Note that here we test for yy_c_buf_p "<=" to the position - * of the first EOB in the buffer, since yy_c_buf_p will - * already have been incremented past the NUL character - * (since all states make transitions on EOB to the - * end-of-buffer state). Contrast this with the test - * in input(). - */ - if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) - { /* This was really a NUL. */ - yy_state_type yy_next_state; - - (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( ); - - /* Okay, we're now positioned to make the NUL - * transition. We couldn't have - * yy_get_previous_state() go ahead and do it - * for us because it doesn't know how to deal - * with the possibility of jamming (and we don't - * want to build jamming into it because then it - * will run more slowly). - */ - - yy_next_state = yy_try_NUL_trans( yy_current_state ); - - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - - if ( yy_next_state ) - { - /* Consume the NUL. */ - yy_cp = ++(yy_c_buf_p); - yy_current_state = yy_next_state; - goto yy_match; - } - - else - { - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); - goto yy_find_action; - } - } - - else switch ( yy_get_next_buffer( ) ) - { - case EOB_ACT_END_OF_FILE: - { - (yy_did_buffer_switch_on_eof) = 0; - - if ( yywrap( ) ) - { - /* Note: because we've taken care in - * yy_get_next_buffer() to have set up - * yytext, we can now set up - * yy_c_buf_p so that if some total - * hoser (like flex itself) wants to - * call the scanner after we return the - * YY_NULL, it'll still work - another - * YY_NULL will get returned. - */ - (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; - - yy_act = YY_STATE_EOF(YY_START); - goto do_action; - } - - else - { - if ( ! (yy_did_buffer_switch_on_eof) ) - YY_NEW_FILE; - } - break; - } - - case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = - (yytext_ptr) + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( ); - - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - goto yy_match; - - case EOB_ACT_LAST_MATCH: - (yy_c_buf_p) = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; - - yy_current_state = yy_get_previous_state( ); - - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - goto yy_find_action; - } - break; - } - - default: - YY_FATAL_ERROR( - "fatal flex scanner internal error--no action found" ); - } /* end of action switch */ - } /* end of scanning one token */ - } /* end of user's declarations */ -} /* end of yylex */ - -/* yy_get_next_buffer - try to read in a new buffer - * - * Returns a code representing an action: - * EOB_ACT_LAST_MATCH - - * EOB_ACT_CONTINUE_SCAN - continue scanning from current position - * EOB_ACT_END_OF_FILE - end of file - */ -static int yy_get_next_buffer (void) -{ - char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - char *source = (yytext_ptr); - int number_to_move, i; - int ret_val; - - if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) - YY_FATAL_ERROR( - "fatal flex scanner internal error--end of buffer missed" ); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) - { /* Don't try to fill the buffer, so this is an EOF. */ - if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) - { - /* We matched a single character, the EOB, so - * treat this as a final EOF. - */ - return EOB_ACT_END_OF_FILE; - } - - else - { - /* We matched some text prior to the EOB, first - * process it. - */ - return EOB_ACT_LAST_MATCH; - } - } - - /* Try to read more data. */ - - /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); - - for ( i = 0; i < number_to_move; ++i ) - *(dest++) = *(source++); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) - /* don't do the read, it's not guaranteed to return an EOF, - * just force an EOF - */ - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; - - else - { - int num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; - - while ( num_to_read <= 0 ) - { /* Not enough room in the buffer - grow it. */ - - /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; - - int yy_c_buf_p_offset = - (int) ((yy_c_buf_p) - b->yy_ch_buf); - - if ( b->yy_is_our_buffer ) - { - int new_size = b->yy_buf_size * 2; - - if ( new_size <= 0 ) - b->yy_buf_size += b->yy_buf_size / 8; - else - b->yy_buf_size *= 2; - - b->yy_ch_buf = (char *) - /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); - } - else - /* Can't grow it, we don't own it. */ - b->yy_ch_buf = NULL; - - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( - "fatal error - scanner input buffer overflow" ); - - (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; - - num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - - number_to_move - 1; - - } - - if ( num_to_read > YY_READ_BUF_SIZE ) - num_to_read = YY_READ_BUF_SIZE; - - /* Read in more data. */ - YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), num_to_read ); - - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } - - if ( (yy_n_chars) == 0 ) - { - if ( number_to_move == YY_MORE_ADJ ) - { - ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); - } - - else - { - ret_val = EOB_ACT_LAST_MATCH; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = - YY_BUFFER_EOF_PENDING; - } - } - - else - ret_val = EOB_ACT_CONTINUE_SCAN; - - if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { - /* Extend the array by 50%, plus the number we really need. */ - int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); - if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); - } - - (yy_n_chars) += number_to_move; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; - - (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; - - return ret_val; -} - -/* yy_get_previous_state - get the state just before the EOB char was reached */ - - static yy_state_type yy_get_previous_state (void) -{ - yy_state_type yy_current_state; - char *yy_cp; - - yy_current_state = (yy_start); - yy_current_state += YY_AT_BOL(); - - for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) - { - YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 166 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; - } - - return yy_current_state; -} - -/* yy_try_NUL_trans - try to make a transition on the NUL character - * - * synopsis - * next_state = yy_try_NUL_trans( current_state ); - */ - static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) -{ - int yy_is_jam; - char *yy_cp = (yy_c_buf_p); - - YY_CHAR yy_c = 1; - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 166 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; - yy_is_jam = (yy_current_state == 165); - - return yy_is_jam ? 0 : yy_current_state; -} - -#ifndef YY_NO_UNPUT - -#endif - -#ifndef YY_NO_INPUT -#ifdef __cplusplus - static int yyinput (void) -#else - static int input (void) -#endif - -{ - int c; - - *(yy_c_buf_p) = (yy_hold_char); - - if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) - { - /* yy_c_buf_p now points to the character we want to return. - * If this occurs *before* the EOB characters, then it's a - * valid NUL; if not, then we've hit the end of the buffer. - */ - if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) - /* This was really a NUL. */ - *(yy_c_buf_p) = '\0'; - - else - { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); - ++(yy_c_buf_p); - - switch ( yy_get_next_buffer( ) ) - { - case EOB_ACT_LAST_MATCH: - /* This happens because yy_g_n_b() - * sees that we've accumulated a - * token and flags that we need to - * try matching the token before - * proceeding. But for input(), - * there's no matching to consider. - * So convert the EOB_ACT_LAST_MATCH - * to EOB_ACT_END_OF_FILE. - */ - - /* Reset buffer status. */ - yyrestart(yyin ); - - /*FALLTHROUGH*/ - - case EOB_ACT_END_OF_FILE: - { - if ( yywrap( ) ) - return 0; - - if ( ! (yy_did_buffer_switch_on_eof) ) - YY_NEW_FILE; -#ifdef __cplusplus - return yyinput(); -#else - return input(); -#endif - } - - case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = (yytext_ptr) + offset; - break; - } - } - } - - c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ - *(yy_c_buf_p) = '\0'; /* preserve yytext */ - (yy_hold_char) = *++(yy_c_buf_p); - - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n'); - - return c; -} -#endif /* ifndef YY_NO_INPUT */ - -/** Immediately switch to a different input stream. - * @param input_file A readable stream. - * - * @note This function does not reset the start condition to @c INITIAL . - */ - void yyrestart (FILE * input_file ) -{ - - if ( ! YY_CURRENT_BUFFER ){ - yyensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); - } - - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); -} - -/** Switch to a different input buffer. - * @param new_buffer The new input buffer. - * - */ - void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) -{ - - /* TODO. We should be able to replace this entire function body - * with - * yypop_buffer_state(); - * yypush_buffer_state(new_buffer); - */ - yyensure_buffer_stack (); - if ( YY_CURRENT_BUFFER == new_buffer ) - return; - - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } - - YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); - - /* We don't actually know whether we did this switch during - * EOF (yywrap()) processing, but the only time this flag - * is looked at is after yywrap() is called, so it's safe - * to go ahead and always set it. - */ - (yy_did_buffer_switch_on_eof) = 1; -} - -static void yy_load_buffer_state (void) -{ - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; - yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; - (yy_hold_char) = *(yy_c_buf_p); -} - -/** Allocate and initialize an input buffer state. - * @param file A readable stream. - * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * - * @return the allocated buffer state. - */ - YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) -{ - YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_buf_size = (yy_size_t)size; - - /* yy_ch_buf has to be 2 characters longer than the size given because - * we need to put in 2 end-of-buffer characters. - */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_is_our_buffer = 1; - - yy_init_buffer(b,file ); - - return b; -} - -/** Destroy the buffer. - * @param b a buffer created with yy_create_buffer() - * - */ - void yy_delete_buffer (YY_BUFFER_STATE b ) -{ - - if ( ! b ) - return; - - if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ - YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; - - if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); - - yyfree((void *) b ); -} - -/* Initializes or reinitializes a buffer. - * This function is sometimes called more than once on the same buffer, - * such as during a yyrestart() or at EOF. - */ - static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) - -{ - int oerrno = errno; - - yy_flush_buffer(b ); - - b->yy_input_file = file; - b->yy_fill_buffer = 1; - - /* If b is the current buffer, then yy_init_buffer was _probably_ - * called from yyrestart() or through yy_get_next_buffer. - * In that case, we don't want to reset the lineno or column. - */ - if (b != YY_CURRENT_BUFFER){ - b->yy_bs_lineno = 1; - b->yy_bs_column = 0; - } - - b->yy_is_interactive = 0; - - errno = oerrno; -} - -/** Discard all buffered characters. On the next scan, YY_INPUT will be called. - * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * - */ - void yy_flush_buffer (YY_BUFFER_STATE b ) -{ - if ( ! b ) - return; - - b->yy_n_chars = 0; - - /* We always need two end-of-buffer characters. The first causes - * a transition to the end-of-buffer state. The second causes - * a jam in that state. - */ - b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; - b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; - - b->yy_buf_pos = &b->yy_ch_buf[0]; - - b->yy_at_bol = 1; - b->yy_buffer_status = YY_BUFFER_NEW; - - if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); -} - -/** Pushes the new state onto the stack. The new state becomes - * the current state. This function will allocate the stack - * if necessary. - * @param new_buffer The new state. - * - */ -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) -{ - if (new_buffer == NULL) - return; - - yyensure_buffer_stack(); - - /* This block is copied from yy_switch_to_buffer. */ - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } - - /* Only push if top exists. Otherwise, replace top. */ - if (YY_CURRENT_BUFFER) - (yy_buffer_stack_top)++; - YY_CURRENT_BUFFER_LVALUE = new_buffer; - - /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; -} - -/** Removes and deletes the top of the stack, if present. - * The next element becomes the new top. - * - */ -void yypop_buffer_state (void) -{ - if (!YY_CURRENT_BUFFER) - return; - - yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - if ((yy_buffer_stack_top) > 0) - --(yy_buffer_stack_top); - - if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; - } -} - -/* Allocates the stack if it does not exist. - * Guarantees space for at least one push. - */ -static void yyensure_buffer_stack (void) -{ - int num_to_alloc; - - if (!(yy_buffer_stack)) { - - /* First allocation is just for 2 elements, since we don't know if this - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. - */ - num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ - (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - ); - if ( ! (yy_buffer_stack) ) - YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - - memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - - (yy_buffer_stack_max) = num_to_alloc; - (yy_buffer_stack_top) = 0; - return; - } - - if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ - - /* Increase the buffer to prepare for a possible push. */ - yy_size_t grow_size = 8 /* arbitrary grow size */; - - num_to_alloc = (yy_buffer_stack_max) + grow_size; - (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc - ((yy_buffer_stack), - num_to_alloc * sizeof(struct yy_buffer_state*) - ); - if ( ! (yy_buffer_stack) ) - YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - - /* zero only the new slots.*/ - memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); - (yy_buffer_stack_max) = num_to_alloc; - } -} - -/** Setup the input buffer state to scan directly from a user-specified character buffer. - * @param base the character buffer - * @param size the size in bytes of the character buffer - * - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) -{ - YY_BUFFER_STATE b; - - if ( size < 2 || - base[size-2] != YY_END_OF_BUFFER_CHAR || - base[size-1] != YY_END_OF_BUFFER_CHAR ) - /* They forgot to leave room for the EOB's. */ - return NULL; - - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ - b->yy_buf_pos = b->yy_ch_buf = base; - b->yy_is_our_buffer = 0; - b->yy_input_file = NULL; - b->yy_n_chars = b->yy_buf_size; - b->yy_is_interactive = 0; - b->yy_at_bol = 1; - b->yy_fill_buffer = 0; - b->yy_buffer_status = YY_BUFFER_NEW; - - yy_switch_to_buffer(b ); - - return b; -} - -/** Setup the input buffer state to scan a string. The next call to yylex() will - * scan from a @e copy of @a str. - * @param yystr a NUL-terminated string to scan - * - * @return the newly allocated buffer state object. - * @note If you want to scan bytes that may contain NUL values, then use - * yy_scan_bytes() instead. - */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) -{ - - return yy_scan_bytes(yystr,(int) strlen(yystr) ); -} - -/** Setup the input buffer state to scan the given bytes. The next call to yylex() will - * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. - * - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) -{ - YY_BUFFER_STATE b; - char *buf; - yy_size_t n; - int i; - - /* Get memory for full buffer, including space for trailing EOB's. */ - n = (yy_size_t) (_yybytes_len + 2); - buf = (char *) yyalloc(n ); - if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - - for ( i = 0; i < _yybytes_len; ++i ) - buf[i] = yybytes[i]; - - buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - - b = yy_scan_buffer(buf,n ); - if ( ! b ) - YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); - - /* It's okay to grow etc. this buffer, and we should throw it - * away when we're done. - */ - b->yy_is_our_buffer = 1; - - return b; -} - -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif - -static void yynoreturn yy_fatal_error (yyconst char* msg ) -{ - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); -} - -/* Redefine yyless() so it works in section 3 code. */ - -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - yytext[yyleng] = (yy_hold_char); \ - (yy_c_buf_p) = yytext + yyless_macro_arg; \ - (yy_hold_char) = *(yy_c_buf_p); \ - *(yy_c_buf_p) = '\0'; \ - yyleng = yyless_macro_arg; \ - } \ - while ( 0 ) - -/* Accessor methods (get/set functions) to struct members. */ - -/** Get the current line number. - * - */ -int yyget_lineno (void) -{ - - return yylineno; -} - -/** Get the input stream. - * - */ -FILE *yyget_in (void) -{ - return yyin; -} - -/** Get the output stream. - * - */ -FILE *yyget_out (void) -{ - return yyout; -} - -/** Get the length of the current token. - * - */ -int yyget_leng (void) -{ - return yyleng; -} - -/** Get the current token. - * - */ - -char *yyget_text (void) -{ - return yytext; -} - -/** Set the current line number. - * @param _line_number line number - * - */ -void yyset_lineno (int _line_number ) -{ - - yylineno = _line_number; -} - -/** Set the input stream. This does not discard the current - * input buffer. - * @param _in_str A readable stream. - * - * @see yy_switch_to_buffer - */ -void yyset_in (FILE * _in_str ) -{ - yyin = _in_str ; -} - -void yyset_out (FILE * _out_str ) -{ - yyout = _out_str ; -} - -int yyget_debug (void) -{ - return yy_flex_debug; -} - -void yyset_debug (int _bdebug ) -{ - yy_flex_debug = _bdebug ; -} - -static int yy_init_globals (void) -{ - /* Initialization is the same as for the non-reentrant scanner. - * This function is called from yylex_destroy(), so don't allocate here. - */ - - (yy_buffer_stack) = NULL; - (yy_buffer_stack_top) = 0; - (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = NULL; - (yy_init) = 0; - (yy_start) = 0; - -/* Defined in main.c */ -#ifdef YY_STDINIT - yyin = stdin; - yyout = stdout; -#else - yyin = NULL; - yyout = NULL; -#endif - - /* For future reference: Set errno on error, since we are called by - * yylex_init() - */ - return 0; -} - -/* yylex_destroy is for both reentrant and non-reentrant scanners. */ -int yylex_destroy (void) -{ - - /* Pop the buffer stack, destroying each element. */ - while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - yypop_buffer_state(); - } - - /* Destroy the stack itself. */ - yyfree((yy_buffer_stack) ); - (yy_buffer_stack) = NULL; - - /* Reset the globals. This is important in a non-reentrant scanner so the next time - * yylex() is called, initialization will occur. */ - yy_init_globals( ); - - return 0; -} - -/* - * Internal utility routines. - */ - -#ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) -{ - - int i; - for ( i = 0; i < n; ++i ) - s1[i] = s2[i]; -} -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) -{ - int n; - for ( n = 0; s[n]; ++n ) - ; - - return n; -} -#endif - -void *yyalloc (yy_size_t size ) -{ - return malloc(size); -} - -void *yyrealloc (void * ptr, yy_size_t size ) -{ - - /* The cast to (char *) in the following accommodates both - * implementations that use char* generic pointers, and those - * that use void* generic pointers. It works with the latter - * because both ANSI C and C++ allow castless assignment from - * any pointer type to void*, and deal with argument conversions - * as though doing an assignment. - */ - return realloc(ptr, size); -} - -void yyfree (void * ptr ) -{ - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ -} - -#define YYTABLES_NAME "yytables" - -#line 272 "dtc-lexer.l" - - - -static void push_input_file(const char *filename) -{ - assert(filename); - - srcfile_push(filename); - - yyin = current_srcfile->f; - - yypush_buffer_state(yy_create_buffer(yyin,YY_BUF_SIZE)); -} - - -static bool pop_input_file(void) -{ - if (srcfile_pop() == 0) - return false; - - yypop_buffer_state(); - yyin = current_srcfile->f; - - return true; -} - -static void lexical_error(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - srcpos_verror(&yylloc, "Lexical error", fmt, ap); - va_end(ap); - - treesource_error = true; -} -scripts/dtc/dtc-parser.tab.c_shipped deleted +0
-2321@@ -1,2321 +0,0 @@ -/* A Bison parser, made by GNU Bison 3.0.4. */ - -/* Bison implementation for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -/* C LALR(1) parser skeleton written by Richard Stallman, by - simplifying the original so-called "semantic" parser. */ - -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ - -/* Identify Bison output. */ -#define YYBISON 1 - -/* Bison version. */ -#define YYBISON_VERSION "3.0.4" - -/* Skeleton name. */ -#define YYSKELETON_NAME "yacc.c" - -/* Pure parsers. */ -#define YYPURE 0 - -/* Push parsers. */ -#define YYPUSH 0 - -/* Pull parsers. */ -#define YYPULL 1 - - - - -/* Copy the first part of user declarations. */ -#line 20 "dtc-parser.y" /* yacc.c:339 */ - -#include <stdio.h> -#include <inttypes.h> - -#include "dtc.h" -#include "srcpos.h" - -extern int yylex(void); -extern void yyerror(char const *s); -#define ERROR(loc, ...) \ - do { \ - srcpos_error((loc), "Error", __VA_ARGS__); \ - treesource_error = true; \ - } while (0) - -extern struct dt_info *parser_output; -extern bool treesource_error; - -#line 85 "dtc-parser.tab.c" /* yacc.c:339 */ - -# ifndef YY_NULLPTR -# if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULLPTR nullptr -# else -# define YY_NULLPTR 0 -# endif -# endif - -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 0 -#endif - -/* In a future release of Bison, this section will be replaced - by #include "dtc-parser.tab.h". */ -#ifndef YY_YY_DTC_PARSER_TAB_H_INCLUDED -# define YY_YY_DTC_PARSER_TAB_H_INCLUDED -/* Debug traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif -#if YYDEBUG -extern int yydebug; -#endif - -/* Token type. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - enum yytokentype - { - DT_V1 = 258, - DT_PLUGIN = 259, - DT_MEMRESERVE = 260, - DT_LSHIFT = 261, - DT_RSHIFT = 262, - DT_LE = 263, - DT_GE = 264, - DT_EQ = 265, - DT_NE = 266, - DT_AND = 267, - DT_OR = 268, - DT_BITS = 269, - DT_DEL_PROP = 270, - DT_DEL_NODE = 271, - DT_PROPNODENAME = 272, - DT_LITERAL = 273, - DT_CHAR_LITERAL = 274, - DT_BYTE = 275, - DT_STRING = 276, - DT_LABEL = 277, - DT_REF = 278, - DT_INCBIN = 279 - }; -#endif - -/* Value type. */ -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED - -union YYSTYPE -{ -#line 39 "dtc-parser.y" /* yacc.c:355 */ - - char *propnodename; - char *labelref; - uint8_t byte; - struct data data; - - struct { - struct data data; - int bits; - } array; - - struct property *prop; - struct property *proplist; - struct node *node; - struct node *nodelist; - struct reserve_info *re; - uint64_t integer; - unsigned int flags; - -#line 170 "dtc-parser.tab.c" /* yacc.c:355 */ -}; - -typedef union YYSTYPE YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 -# define YYSTYPE_IS_DECLARED 1 -#endif - -/* Location type. */ -#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE YYLTYPE; -struct YYLTYPE -{ - int first_line; - int first_column; - int last_line; - int last_column; -}; -# define YYLTYPE_IS_DECLARED 1 -# define YYLTYPE_IS_TRIVIAL 1 -#endif - - -extern YYSTYPE yylval; -extern YYLTYPE yylloc; -int yyparse (void); - -#endif /* !YY_YY_DTC_PARSER_TAB_H_INCLUDED */ - -/* Copy the second part of user declarations. */ - -#line 201 "dtc-parser.tab.c" /* yacc.c:358 */ - -#ifdef short -# undef short -#endif - -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; -#endif - -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; -#else -typedef signed char yytype_int8; -#endif - -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; -#else -typedef unsigned short int yytype_uint16; -#endif - -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; -#else -typedef short int yytype_int16; -#endif - -#ifndef YYSIZE_T -# ifdef __SIZE_TYPE__ -# define YYSIZE_T __SIZE_TYPE__ -# elif defined size_t -# define YYSIZE_T size_t -# elif ! defined YYSIZE_T -# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# else -# define YYSIZE_T unsigned int -# endif -#endif - -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) - -#ifndef YY_ -# if defined YYENABLE_NLS && YYENABLE_NLS -# if ENABLE_NLS -# include <libintl.h> /* INFRINGES ON USER NAME SPACE */ -# define YY_(Msgid) dgettext ("bison-runtime", Msgid) -# endif -# endif -# ifndef YY_ -# define YY_(Msgid) Msgid -# endif -#endif - -#ifndef YY_ATTRIBUTE -# if (defined __GNUC__ \ - && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ - || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C -# define YY_ATTRIBUTE(Spec) __attribute__(Spec) -# else -# define YY_ATTRIBUTE(Spec) /* empty */ -# endif -#endif - -#ifndef YY_ATTRIBUTE_PURE -# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) -#endif - -#ifndef YY_ATTRIBUTE_UNUSED -# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) -#endif - -#if !defined _Noreturn \ - && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) -# if defined _MSC_VER && 1200 <= _MSC_VER -# define _Noreturn __declspec (noreturn) -# else -# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) -# endif -#endif - -/* Suppress unused-variable warnings by "using" E. */ -#if ! defined lint || defined __GNUC__ -# define YYUSE(E) ((void) (E)) -#else -# define YYUSE(E) /* empty */ -#endif - -#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ -/* Suppress an incorrect diagnostic about yylval being uninitialized. */ -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ - _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") -# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ - _Pragma ("GCC diagnostic pop") -#else -# define YY_INITIAL_VALUE(Value) Value -#endif -#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_END -#endif -#ifndef YY_INITIAL_VALUE -# define YY_INITIAL_VALUE(Value) /* Nothing. */ -#endif - - -#if ! defined yyoverflow || YYERROR_VERBOSE - -/* The parser invokes alloca or malloc; define the necessary symbols. */ - -# ifdef YYSTACK_USE_ALLOCA -# if YYSTACK_USE_ALLOCA -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# elif defined __BUILTIN_VA_ARG_INCR -# include <alloca.h> /* INFRINGES ON USER NAME SPACE */ -# elif defined _AIX -# define YYSTACK_ALLOC __alloca -# elif defined _MSC_VER -# include <malloc.h> /* INFRINGES ON USER NAME SPACE */ -# define alloca _alloca -# else -# define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS -# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ - /* Use EXIT_SUCCESS as a witness for stdlib.h. */ -# ifndef EXIT_SUCCESS -# define EXIT_SUCCESS 0 -# endif -# endif -# endif -# endif -# endif - -# ifdef YYSTACK_ALLOC - /* Pacify GCC's 'empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -# ifndef YYSTACK_ALLOC_MAXIMUM - /* The OS might guarantee only one guard page at the bottom of the stack, - and a page size can be as small as 4096 bytes. So we cannot safely - invoke alloca (N) if N exceeds 4096. Use a slightly smaller number - to allow for a few compiler-allocated temporary stack slots. */ -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ -# endif -# else -# define YYSTACK_ALLOC YYMALLOC -# define YYSTACK_FREE YYFREE -# ifndef YYSTACK_ALLOC_MAXIMUM -# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM -# endif -# if (defined __cplusplus && ! defined EXIT_SUCCESS \ - && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) -# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# ifndef EXIT_SUCCESS -# define EXIT_SUCCESS 0 -# endif -# endif -# ifndef YYMALLOC -# define YYMALLOC malloc -# if ! defined malloc && ! defined EXIT_SUCCESS -void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# ifndef YYFREE -# define YYFREE free -# if ! defined free && ! defined EXIT_SUCCESS -void free (void *); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ - - -#if (! defined yyoverflow \ - && (! defined __cplusplus \ - || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ - && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) - -/* A type that is properly aligned for any stack member. */ -union yyalloc -{ - yytype_int16 yyss_alloc; - YYSTYPE yyvs_alloc; - YYLTYPE yyls_alloc; -}; - -/* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) - -/* The size of an array large to enough to hold all stacks, each with - N elements. */ -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ - + 2 * YYSTACK_GAP_MAXIMUM) - -# define YYCOPY_NEEDED 1 - -/* Relocate STACK from its old location to the new one. The - local variables YYSIZE and YYSTACKSIZE give the old and new number of - elements in the stack, and YYPTR gives the new location of the - stack. Advance YYPTR to a properly aligned location for the next - stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (0) - -#endif - -#if defined YYCOPY_NEEDED && YYCOPY_NEEDED -/* Copy COUNT objects from SRC to DST. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(Dst, Src, Count) \ - __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) -# else -# define YYCOPY(Dst, Src, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (Dst)[yyi] = (Src)[yyi]; \ - } \ - while (0) -# endif -# endif -#endif /* !YYCOPY_NEEDED */ - -/* YYFINAL -- State number of the termination state. */ -#define YYFINAL 6 -/* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 138 - -/* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 48 -/* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 30 -/* YYNRULES -- Number of rules. */ -#define YYNRULES 85 -/* YYNSTATES -- Number of states. */ -#define YYNSTATES 149 - -/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned - by yylex, with out-of-bounds checking. */ -#define YYUNDEFTOK 2 -#define YYMAXUTOK 279 - -#define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) - -/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM - as returned by yylex, without out-of-bounds checking. */ -static const yytype_uint8 yytranslate[] = -{ - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 47, 2, 2, 2, 45, 41, 2, - 33, 35, 44, 42, 34, 43, 2, 26, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 38, 25, - 36, 29, 30, 37, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 31, 2, 32, 40, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 27, 39, 28, 46, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24 -}; - -#if YYDEBUG - /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ -static const yytype_uint16 yyrline[] = -{ - 0, 109, 109, 117, 121, 128, 129, 139, 142, 149, - 153, 161, 165, 170, 181, 200, 213, 220, 228, 231, - 238, 242, 246, 250, 258, 262, 266, 270, 274, 290, - 300, 308, 311, 315, 322, 338, 343, 362, 376, 383, - 384, 385, 392, 396, 397, 401, 402, 406, 407, 411, - 412, 416, 417, 421, 422, 426, 427, 428, 432, 433, - 434, 435, 436, 440, 441, 442, 446, 447, 448, 452, - 453, 462, 471, 475, 476, 477, 478, 483, 486, 490, - 498, 501, 505, 513, 517, 521 -}; -#endif - -#if YYDEBUG || YYERROR_VERBOSE || 0 -/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ -static const char *const yytname[] = -{ - "$end", "error", "$undefined", "DT_V1", "DT_PLUGIN", "DT_MEMRESERVE", - "DT_LSHIFT", "DT_RSHIFT", "DT_LE", "DT_GE", "DT_EQ", "DT_NE", "DT_AND", - "DT_OR", "DT_BITS", "DT_DEL_PROP", "DT_DEL_NODE", "DT_PROPNODENAME", - "DT_LITERAL", "DT_CHAR_LITERAL", "DT_BYTE", "DT_STRING", "DT_LABEL", - "DT_REF", "DT_INCBIN", "';'", "'/'", "'{'", "'}'", "'='", "'>'", "'['", - "']'", "'('", "','", "')'", "'<'", "'?'", "':'", "'|'", "'^'", "'&'", - "'+'", "'-'", "'*'", "'%'", "'~'", "'!'", "$accept", "sourcefile", - "header", "headers", "memreserves", "memreserve", "devicetree", - "nodedef", "proplist", "propdef", "propdata", "propdataprefix", - "arrayprefix", "integer_prim", "integer_expr", "integer_trinary", - "integer_or", "integer_and", "integer_bitor", "integer_bitxor", - "integer_bitand", "integer_eq", "integer_rela", "integer_shift", - "integer_add", "integer_mul", "integer_unary", "bytestring", "subnodes", - "subnode", YY_NULLPTR -}; -#endif - -# ifdef YYPRINT -/* YYTOKNUM[NUM] -- (External) token number corresponding to the - (internal) symbol number NUM (which must be that of a token). */ -static const yytype_uint16 yytoknum[] = -{ - 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 59, 47, 123, 125, 61, - 62, 91, 93, 40, 44, 41, 60, 63, 58, 124, - 94, 38, 43, 45, 42, 37, 126, 33 -}; -# endif - -#define YYPACT_NINF -44 - -#define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-44))) - -#define YYTABLE_NINF -1 - -#define yytable_value_is_error(Yytable_value) \ - 0 - - /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -static const yytype_int8 yypact[] = -{ - 14, 27, 61, 14, 8, 18, -44, -44, 37, 8, - 40, 8, 64, -44, -44, -12, 37, -44, 50, 52, - -44, -44, -12, -12, -12, -44, 51, -44, -4, 78, - 53, 54, 55, 17, 2, 30, 38, -3, -44, 66, - -44, -44, 70, 72, 50, 50, -44, -44, -44, -44, - -12, -12, -12, -12, -12, -12, -12, -12, -12, -12, - -12, -12, -12, -12, -12, -12, -12, -12, -12, -44, - 3, 73, 50, -44, -44, 78, 59, 53, 54, 55, - 17, 2, 2, 30, 30, 30, 30, 38, 38, -3, - -3, -44, -44, -44, 82, 83, 44, 3, -44, 74, - 3, -44, -44, -12, 76, 79, -44, -44, -44, -44, - -44, 80, -44, -44, -44, -44, -44, -10, 36, -44, - -44, -44, -44, 85, -44, -44, -44, 75, -44, -44, - 21, 71, 88, -6, -44, -44, -44, -44, -44, 11, - -44, -44, -44, 37, -44, 77, 37, 81, -44 -}; - - /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. - Performed when YYTABLE does not specify something else to do. Zero - means the default is an error. */ -static const yytype_uint8 yydefact[] = -{ - 0, 0, 0, 5, 7, 3, 1, 6, 0, 0, - 16, 7, 0, 39, 40, 0, 0, 10, 0, 2, - 8, 4, 0, 0, 0, 73, 0, 42, 43, 45, - 47, 49, 51, 53, 55, 58, 65, 68, 72, 0, - 18, 11, 0, 0, 0, 0, 74, 75, 76, 41, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, - 80, 0, 0, 14, 12, 46, 0, 48, 50, 52, - 54, 56, 57, 61, 62, 60, 59, 63, 64, 66, - 67, 70, 69, 71, 0, 0, 0, 0, 19, 0, - 80, 15, 13, 0, 0, 0, 21, 31, 83, 23, - 85, 0, 82, 81, 44, 22, 84, 0, 0, 17, - 30, 20, 32, 0, 24, 33, 27, 0, 77, 35, - 0, 0, 0, 0, 38, 37, 25, 36, 34, 0, - 78, 79, 26, 0, 29, 0, 0, 0, 28 -}; - - /* YYPGOTO[NTERM-NUM]. */ -static const yytype_int8 yypgoto[] = -{ - -44, -44, -44, 103, 99, 104, -44, -43, -44, -21, - -44, -44, -44, -8, 63, 9, -44, 65, 67, 68, - 69, 62, 26, 4, 22, 23, -19, -44, 20, 28 -}; - - /* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int16 yydefgoto[] = -{ - -1, 2, 3, 4, 10, 11, 19, 41, 70, 98, - 117, 118, 130, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 133, 99, 100 -}; - - /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule whose - number is the opposite. If YYTABLE_NINF, syntax error. */ -static const yytype_uint8 yytable[] = -{ - 16, 73, 74, 46, 47, 48, 13, 14, 39, 50, - 58, 59, 120, 8, 140, 121, 141, 1, 94, 95, - 96, 15, 12, 66, 122, 97, 142, 56, 57, 102, - 9, 22, 60, 51, 23, 24, 62, 63, 61, 13, - 14, 67, 68, 134, 135, 143, 144, 91, 92, 93, - 123, 136, 5, 108, 15, 13, 14, 124, 125, 126, - 127, 6, 83, 84, 85, 86, 18, 128, 42, 106, - 15, 40, 129, 107, 43, 44, 109, 40, 45, 112, - 64, 65, 81, 82, 87, 88, 49, 89, 90, 21, - 52, 69, 53, 71, 54, 72, 55, 103, 101, 104, - 105, 115, 111, 131, 116, 119, 7, 138, 132, 139, - 20, 146, 114, 17, 76, 75, 148, 80, 0, 77, - 113, 78, 137, 79, 0, 110, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 145, 0, 0, 147 -}; - -static const yytype_int16 yycheck[] = -{ - 8, 44, 45, 22, 23, 24, 18, 19, 16, 13, - 8, 9, 22, 5, 20, 25, 22, 3, 15, 16, - 17, 33, 4, 26, 34, 22, 32, 10, 11, 72, - 22, 43, 30, 37, 46, 47, 6, 7, 36, 18, - 19, 44, 45, 22, 23, 34, 35, 66, 67, 68, - 14, 30, 25, 96, 33, 18, 19, 21, 22, 23, - 24, 0, 58, 59, 60, 61, 26, 31, 16, 25, - 33, 27, 36, 29, 22, 23, 97, 27, 26, 100, - 42, 43, 56, 57, 62, 63, 35, 64, 65, 25, - 12, 25, 39, 23, 40, 23, 41, 38, 25, 17, - 17, 25, 28, 18, 25, 25, 3, 36, 33, 21, - 11, 34, 103, 9, 51, 50, 35, 55, -1, 52, - 100, 53, 130, 54, -1, 97, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 143, -1, -1, 146 -}; - - /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = -{ - 0, 3, 49, 50, 51, 25, 0, 51, 5, 22, - 52, 53, 4, 18, 19, 33, 61, 53, 26, 54, - 52, 25, 43, 46, 47, 61, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 61, - 27, 55, 16, 22, 23, 26, 74, 74, 74, 35, - 13, 37, 12, 39, 40, 41, 10, 11, 8, 9, - 30, 36, 6, 7, 42, 43, 26, 44, 45, 25, - 56, 23, 23, 55, 55, 65, 62, 66, 67, 68, - 69, 70, 70, 71, 71, 71, 71, 72, 72, 73, - 73, 74, 74, 74, 15, 16, 17, 22, 57, 76, - 77, 25, 55, 38, 17, 17, 25, 29, 55, 57, - 77, 28, 57, 76, 63, 25, 25, 58, 59, 25, - 22, 25, 34, 14, 21, 22, 23, 24, 31, 36, - 60, 18, 33, 75, 22, 23, 30, 61, 36, 21, - 20, 22, 32, 34, 35, 61, 34, 61, 35 -}; - - /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 48, 49, 50, 50, 51, 51, 52, 52, 53, - 53, 54, 54, 54, 54, 54, 54, 55, 56, 56, - 57, 57, 57, 57, 58, 58, 58, 58, 58, 58, - 58, 59, 59, 59, 60, 60, 60, 60, 60, 61, - 61, 61, 62, 63, 63, 64, 64, 65, 65, 66, - 66, 67, 67, 68, 68, 69, 69, 69, 70, 70, - 70, 70, 70, 71, 71, 71, 72, 72, 72, 73, - 73, 73, 73, 74, 74, 74, 74, 75, 75, 75, - 76, 76, 76, 77, 77, 77 -}; - - /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 3, 2, 4, 1, 2, 0, 2, 4, - 2, 2, 3, 4, 3, 4, 0, 5, 0, 2, - 4, 2, 3, 2, 2, 3, 4, 2, 9, 5, - 2, 0, 2, 2, 3, 1, 2, 2, 2, 1, - 1, 3, 1, 1, 5, 1, 3, 1, 3, 1, - 3, 1, 3, 1, 3, 1, 3, 3, 1, 3, - 3, 3, 3, 3, 3, 1, 3, 3, 1, 3, - 3, 3, 1, 1, 2, 2, 2, 0, 2, 2, - 0, 2, 2, 2, 3, 2 -}; - - -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -#define YYRECOVERING() (!!yyerrstatus) - -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (yylen); \ - yystate = *yyssp; \Lines of this file are not shown. View the raw message.
scripts/dtc/dtc-parser.tab.h_shipped deleted +0
-125Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.17.0
Part of the diff is not shown here. View the raw message.
PATCH v2 5/6 scripts/dtc: Re-sync with Linux 4.17-rc4
Hi Eugeniu,
Quoted 6 lines · Eugeniu Rosca
Dear Masahiro, Simon,
I think this patch logically belongs and is tightly coupled to the Linux 4.17-rc4
Kconfigre-sync. Since you skipped it, I wonder if you have a different view on this.
Quoted 7 lines
Most of the Linux commits imported here are actually DTC-specific pieces from the Linux commits squashed into
Kconfigre-sync patch. The idea of doing that is to create a patch whose scope is limited to DTC. I could have kept the integrity of Linux commits, which would have extended theKconfigre-sync patch to DTC as well. I still can take a different approach, depending on your feedback. Filtering out this patch doesn't sound good to me. TIA for your input.
It seems OK to me, but Masahiro is the expert here.
- Simon
PATCH v2 5/6 scripts/dtc: Re-sync with Linux 4.17-rc4
In reply to Eugeniu Rosca2018-05-15 23:06 GMT+09:00 Eugeniu Rosca <[email protected]>:
Quoted 6 lines
Dear Masahiro, Simon,
I think this patch logically belongs and is tightly coupled to the Linux 4.17-rc4
Kconfigre-sync. Since you skipped it, I wonder if you have a different view on this.
Quoted 7 lines
Most of the Linux commits imported here are actually DTC-specific pieces from the Linux commits squashed into
Kconfigre-sync patch. The idea of doing that is to create a patch whose scope is limited to DTC. I could have kept the integrity of Linux commits, which would have extended theKconfigre-sync patch to DTC as well. I still can take a different approach, depending on your feedback. Filtering out this patch doesn't sound good to me. TIA for your input.
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH v2 6/6 sandbox: dts: test: Fix wrong aliases property names
In reply to Eugeniu RoscaAfter importing v4.17-rc1 Linux commit 9130ba884640 ("scripts/dtc:
Update to upstream version v1.4.6-9-gaadd0b65c987"), sandbox build reports below warnings:
arch/sandbox/dts/test.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/sandbox/dts/test.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/sandbox/dts/test.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/sandbox/dts/test.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-'
Silent them.
---
v1->v2:
* Newly pushed
arch/sandbox/dts/test.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/sandbox/dts/test.dts +4 -4
@@ -27,10 +27,10 @@ testfdt3 = "/b-test"; testfdt5 = "/some-bus/c-test at 5"; testfdt8 = "/a-test"; - fdt_dummy0 = "/translation-test at 8000/dev at 0,0"; - fdt_dummy1 = "/translation-test at 8000/dev at 1,100"; - fdt_dummy2 = "/translation-test at 8000/dev at 2,200"; - fdt_dummy3 = "/translation-test at 8000/noxlatebus at 3,300/dev at 42"; + fdt-dummy0 = "/translation-test at 8000/dev at 0,0"; + fdt-dummy1 = "/translation-test at 8000/dev at 1,100"; + fdt-dummy2 = "/translation-test at 8000/dev at 2,200"; + fdt-dummy3 = "/translation-test at 8000/noxlatebus at 3,300/dev at 42"; usb0 = &usb_0; usb1 = &usb_1; usb2 = &usb_2;
Signature · 1 line
2.17.0
PATCH v2 6/6 sandbox: dts: test: Fix wrong aliases property names
Quoted 13 lines · Eugeniu Rosca
After importing v4.17-rc1 Linux commit
9130ba884640("scripts/dtc:
Update to upstream version v1.4.6-9-gaadd0b65c987"), sandbox build reports below warnings:
arch/sandbox/dts/test.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-'arch/sandbox/dts/test.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-'arch/sandbox/dts/test.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-'arch/sandbox/dts/test.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-'Silent them.
Fixes e8d5291824e2 ("core: ofnode: Fix translation for #size-cells == 0")Signed-off-by Eugeniu Rosca <[email protected]>
Quoted 7 lines
---
v1->v2:
* Newly pushedarch/sandbox/dts/test.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
PATCH v2 1/6 kconfig: re-sync with Linux 4.17-rc4
In reply to Eugeniu RoscaHi Eugeniu,
Quoted 5 lines
My testing was limited to:
- make defconfig all
- make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu-r8a7795_ulcb_defconfigall
- comparing .config before and after the re-sync
- running the newly importedKconfigunit tests as seen below:
I tested whole patch-set with the other options:
make config
make defconfig
make menuconfig
make xconfig
make gconfig
make oldconfig
Quoted 2 lines
Reviewed-by Masahiro Yamada <[email protected]>Signed-off-by Eugeniu Rosca <[email protected]>
Quoted 17 lines
$ make testconfig============================= 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%]
Quoted 1 line
========================== 14 passed in 0.34 seconds ==========================
When applied all 6 patches, I got several errors (see bellow). I tested in on 2 distros (Debian unstable and openSUSE Tumbleweed). The code I applied is here, did I make error when applying patches?
https://github.com/pevik/u-boot/tree/eugeniu/kconfig.v2
Kind regards,
Petr
$ make testconfig python3 -B -m pytest ./scripts/kconfig/tests \ -o cache_dir=/home/pevik/install/src/u-boot.git/scripts/kconfig/tests/.cache \
============================= test session starts ============================== platform linux -- Python 3.6.5, pytest-3.3.2, py-1.5.3, pluggy-0.6.0 -- /usr/bin/python3
cachedir: scripts/kconfig/tests/.cache
rootdir: /home/pevik/install/src/u-boot.git/scripts/kconfig/tests, inifile: pytest.ini collecting ... collected 14 items
scripts/kconfig/tests/auto_submenu/__init__.py::test FAILED [ 7%] scripts/kconfig/tests/choice/__init__.py::test_oldask0 FAILED [ 14%] scripts/kconfig/tests/choice/__init__.py::test_oldask1 FAILED [ 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 FAILED [ 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%]
=================================== FAILURES =================================== _____________________________________ test _____________________________________
conf = <conftest.Conf object@0x7f7eeeaa6d30>
def test(conf):
assert conf.oldaskconfig() == 0Quoted 1 line
assert
conf.stdout_contains('expected_stdout')
E AssertionError
scripts/kconfig/tests/auto_submenu/__init__.py:12: AssertionError ----------------------------- Captured stdout call ----------------------------- [command]/home/pevik/install/src/u-boot.git/scripts/kconfig/conf --oldaskconfig Kconfig
[retcode]
0
[stdout]
*
* Linux Kernel Configuration
*
A (A) [Y/n/?] (NEW)
A0 (A0) [Y/n/?] (NEW)
A1_0 (A0_0) [N/y/?] (NEW)
A1 (A1) [Y/n/?] (NEW)
choice
> 1. A1_0 (A1_0) (NEW)
2. A1_1 (A1_1) (NEW)
choice[1-2?]:
B (B) [N/y/?] (NEW)
C (C) [N/y/?] (NEW)
#
# configuration written to .config
#[stderr]
[output for '.config']
#
# Automatically generated file; DO NOT EDIT.
# Linux Kernel Configuration
#CONFIG_A=yCONFIG_A0=y
# CONFIG_A0_0 is not setCONFIG_A1=yCONFIG_A1_0=y
# CONFIG_A1_1 is not set
# CONFIG_B is not set
# CONFIG_C is not set
_________________________________ test_oldask0 _________________________________
conf = <conftest.Conf object@0x7f7ef0e167b8>
def test_oldask0(conf):
assert conf.oldaskconfig() == 0Quoted 1 line
assert
conf.stdout_contains('oldask0_expected_stdout')
E AssertionError
scripts/kconfig/tests/choice/__init__.py:15: AssertionError ----------------------------- Captured stdout call ----------------------------- [command]/home/pevik/install/src/u-boot.git/scripts/kconfig/conf --oldaskconfig Kconfig
[retcode]
0
[stdout]
*
* Linux Kernel Configuration
*
Enable loadable module support (MODULES) [Y/n/?] (NEW) boolean choice
1. choice 0 (BOOL_CHOICE0) (NEW)
Quoted 1 line
2. choice 1 (
BOOL_CHOICE1) (NEW)
choice[1-2?]:
optional boolean choice [N/y/?] (NEW)
tristate choice [M/y/?] (NEW)
choice 0 (TRI_CHOICE0) [N/m/?] (NEW)
choice 1 (TRI_CHOICE1) [N/m/?] (NEW)
optional tristate choice [N/m/y/?] (NEW)
#
# configuration written to .config #
[stderr]
[output for '.config']
#
# Automatically generated file; DO NOT EDIT.
# Linux Kernel Configuration
#CONFIG_MODULES=y
# CONFIG_BOOL_CHOICE0 is not setCONFIG_BOOL_CHOICE1=y
# CONFIG_TRI_CHOICE0 is not set
# CONFIG_TRI_CHOICE1 is not set
_________________________________ test_oldask1 _________________________________
conf = <conftest.Conf object@0x7f7ef0e167b8>
def test_oldask1(conf):
assert conf.oldaskconfig('oldask1_config') == 0Quoted 1 line
assert
conf.stdout_contains('oldask1_expected_stdout')
E AssertionError
scripts/kconfig/tests/choice/__init__.py:20: AssertionError ----------------------------- Captured stdout call ----------------------------- [command]/home/pevik/install/src/u-boot.git/scripts/kconfig/conf --oldaskconfig Kconfig
[retcode]
0
[stdout]
*
* Linux Kernel Configuration
*
Enable loadable module support (MODULES) [N/y/?]
boolean choice
1. choice 0 (BOOL_CHOICE0) (NEW)
Quoted 1 line
2. choice 1 (
BOOL_CHOICE1) (NEW)
choice[1-2?]:
optional boolean choice [Y/n/?] (NEW)
optional boolean choice
Quoted 1 line
1. choice 0 (
OPT_BOOL_CHOICE0)
2. choice 1 (OPT_BOOL_CHOICE1) (NEW)
choice[1-2?]:
tristate choice
1. choice 0 (TRI_CHOICE0) (NEW)
Quoted 1 line
2. choice 1 (
TRI_CHOICE1) (NEW)
choice[1-2?]:
optional tristate choice [N/y/?]
#
# configuration written to .config #
[stderr]
[output for '.config']
#
# Automatically generated file; DO NOT EDIT.
# Linux Kernel Configuration
#
# CONFIG_MODULES is not set
# CONFIG_BOOL_CHOICE0 is not setCONFIG_BOOL_CHOICE1=yCONFIG_OPT_BOOL_CHOICE0=y
# CONFIG_OPT_BOOL_CHOICE1 is not set
# CONFIG_TRI_CHOICE0 is not setCONFIG_TRI_CHOICE1=y
_____________________________________ test _____________________________________
conf = <conftest.Conf object@0x7f7eee858400>
def test(conf):
assert conf.oldconfig('config', 'y') == 0Quoted 1 line
assert
conf.stdout_contains('expected_stdout')
E AssertionError
scripts/kconfig/tests/new_choice_with_dep/__init__.py:14: AssertionError ----------------------------- Captured stdout call ----------------------------- [command]/home/pevik/install/src/u-boot.git/scripts/kconfig/conf --oldconfig Kconfig
[retcode]
0
[stdout]
*
* Restart config...
*
*
* Linux Kernel Configuration
*
A (A) [N/y/?] (NEW) y
Choice ?
Quoted 1 line
1. Choice B (
CHOICE_B)
2. Choice C (CHOICE_C) (NEW)
choice[1-2?]:
Choice2 ?
1. Choice D (CHOICE_D)
Quoted 1 line
2. Choice E (
CHOICE_E)
3. Choice F (CHOICE_F) (NEW)
choice[1-3?]:
#
# configuration written to .config #
[stderr]
[output for '.config']
#
# Automatically generated file; DO NOT EDIT.
# Linux Kernel Configuration
#CONFIG_A=yCONFIG_CHOICE_B=y
# CONFIG_CHOICE_C is not set
# CONFIG_CHOICE_D is not setCONFIG_CHOICE_E=y
# CONFIG_CHOICE_F is not set
===================== 4 failed, 10 passed in 0.21 seconds ====================== make[1]: *** [scripts/kconfig/Makefile:156: testconfig] Error 1
make: *** [Makefile:482: testconfig] Error 2
PATCH v2 1/6 kconfig: re-sync with Linux 4.17-rc4
Hello Petr,
Quoted 16 lines · Petr Vorel
Hi Eugeniu,
Quoted 5 lines
My testing was limited to:
- make defconfig all
- make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu-r8a7795_ulcb_defconfigall
- comparing .config before and after the re-sync
- running the newly importedKconfigunit tests as seen below:I tested whole patch-set with the other options:
make config
make defconfig
make menuconfig
make xconfig
make gconfig
make oldconfig
Quoted 3 lines
Quoted 2 lines
Reviewed-by Masahiro Yamada <[email protected]>Signed-off-by Eugeniu Rosca <[email protected]>Tested-by Petr Vorel <[email protected]>
Many thanks for testing!
Quoted 20 lines
Quoted 18 lines
$ make testconfig============================= 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%]Quoted 1 line
========================== 14 passed in 0.34 seconds ==========================
Quoted 4 lines
When applied all 6 patches, I got several errors (see bellow). I tested in on 2 distros (Debian unstable and openSUSE Tumbleweed). The code I applied is here, did I make error when applying patches?
https://github.com/pevik/u-boot/tree/eugeniu/kconfig.v2
I checked your branch and got some interesting conclusions. Here is the diff between my and your version of commit ("kconfig:
re-sync with Linux 4.17-rc4"):
$ git diff <eugeniu> <petr> scripts/kconfig/tests/auto_submenu/expected_stdout | 14 +++++++------- scripts/kconfig/tests/choice/oldask0_expected_stdout | 14 +++++++------- scripts/kconfig/tests/choice/oldask1_expected_stdout | 12 ++++++------ scripts/kconfig/tests/new_choice_with_dep/expected_stdout | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-)
Here is the same diff ignoring whitespace:
$ git diff -w <eugeniu> <petr> scripts/kconfig/tests/auto_submenu/expected_stdout | 0 scripts/kconfig/tests/choice/oldask0_expected_stdout | 0 scripts/kconfig/tests/choice/oldask1_expected_stdout | 0 scripts/kconfig/tests/new_choice_with_dep/expected_stdout | 0 4 files changed, 0 insertions(+), 0 deletions(-)
So, it seems like all the trailing white-space from above files disappeared on your branch, after applying the patches from the email client (who did this?...).
I didn't expect that trailing white-space to be of any value for the test results, but it turns out it is! With the whitespace removed, I can also reproduce the failures of "make testconfig".
I am not familiar with pytest, but, based on what we see here, it looks like every single character stored in *xpected_stdout files (including whitespace at the end of lines) matters for the test to pass.
I wonder if Kconfig could avoid printing whitespace in command line user dialogs. Then maybe those space characters could be removed from the "*xpected_stdout" files.
Masahiro?
Thanks again!
Best regards,
Eugeniu.
PATCH v2 1/6 kconfig: re-sync with Linux 4.17-rc4
Hi Eugeniu,
Quoted 29 lines
Hello Petr,
Quoted 4 lines · Petr Vorel
When applied all 6 patches, I got several errors (see bellow). I tested in on 2 distros (Debian unstable and openSUSE Tumbleweed). The code I applied is here, did I make error when applying patches?
https://github.com/pevik/u-boot/tree/eugeniu/kconfig.v2I checked your branch and got some interesting conclusions. Here is the diff between my and your version of commit ("kconfig:
re-sync with Linux 4.17-rc4"):$ git diff <eugeniu> <petr> scripts/kconfig/tests/auto_submenu/expected_stdout | 14 +++++++------- scripts/kconfig/tests/choice/oldask0_expected_stdout | 14 +++++++------- scripts/kconfig/tests/choice/oldask1_expected_stdout | 12 ++++++------ scripts/kconfig/tests/new_choice_with_dep/expected_stdout | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-)Here is the same diff ignoring whitespace:
$ git diff -w <eugeniu> <petr> scripts/kconfig/tests/auto_submenu/expected_stdout | 0 scripts/kconfig/tests/choice/oldask0_expected_stdout | 0 scripts/kconfig/tests/choice/oldask1_expected_stdout | 0 scripts/kconfig/tests/new_choice_with_dep/expected_stdout | 0 4 files changed, 0 insertions(+), 0 deletions(-)
Quoted 3 lines
So, it seems like all the trailing white-space from above files disappeared on your branch, after applying the patches from the email client (who did this?...).
OK, my fault, I'm sorry. Applying first patch as 'git am --whitespace=warn 1.mbox' fixes that => make testconfig works.
Yes I applied patches with mutt (I usually use pwclient, but somehow I didn't find your v2 in patchwork [1], nor even in ML [2]. Have I overlook something.
[1] https://patchwork.ozlabs.org/project/uboot/list/
[2] https://lists.denx.de/pipermail/u-boot/2018-May/date.html
Kind regards,
Petr
Quoted 18 lines
I didn't expect that trailing white-space to be of any value for the test results, but it turns out it is! With the whitespace removed, I can also reproduce the failures of "make testconfig".
I am not familiar with pytest, but, based on what we see here, it looks like every single character stored in
*xpected_stdoutfiles (including whitespace at the end of lines) matters for the test to pass.I wonder if
Kconfigcould avoid printing whitespace in command line user dialogs. Then maybe those space characters could be removed from the "*xpected_stdout" files.Masahiro?
Thanks again!
Best regards,
Eugeniu.
PATCH v2 1/6 kconfig: re-sync with Linux 4.17-rc4
Hi Petr,
Quoted 34 lines · Petr Vorel
Hi Eugeniu,
Quoted 32 lines
Hello Petr,
Quoted 4 lines · Petr Vorel
When applied all 6 patches, I got several errors (see bellow). I tested in on 2 distros (Debian unstable and openSUSE Tumbleweed). The code I applied is here, did I make error when applying patches?
https://github.com/pevik/u-boot/tree/eugeniu/kconfig.v2I checked your branch and got some interesting conclusions. Here is the diff between my and your version of commit ("kconfig:
re-sync with Linux 4.17-rc4"):$ git diff <eugeniu> <petr> scripts/kconfig/tests/auto_submenu/expected_stdout | 14 +++++++------- scripts/kconfig/tests/choice/oldask0_expected_stdout | 14 +++++++------- scripts/kconfig/tests/choice/oldask1_expected_stdout | 12 ++++++------ scripts/kconfig/tests/new_choice_with_dep/expected_stdout | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-)Here is the same diff ignoring whitespace:
$ git diff -w <eugeniu> <petr> scripts/kconfig/tests/auto_submenu/expected_stdout | 0 scripts/kconfig/tests/choice/oldask0_expected_stdout | 0 scripts/kconfig/tests/choice/oldask1_expected_stdout | 0 scripts/kconfig/tests/new_choice_with_dep/expected_stdout | 0 4 files changed, 0 insertions(+), 0 deletions(-)So, it seems like all the trailing white-space from above files disappeared on your branch, after applying the patches from the email client (who did this?...).
I hope I wasn't too harsh here. By "who" I meant the exact component or script in your workflow which dropped the trailing spaces. By knowing it, we could also improve our own workflows, which is a positive of going through this issue IMHO.
Quoted 2 lines
OK, my fault, I'm sorry. Applying first patch as 'git am --whitespace=warn 1.mbox' fixes that => make testconfig works.
No worries.
Quoted 5 lines
Yes I applied patches with mutt (I usually use pwclient, but somehow I didn't find your v2 in patchwork [1], nor even in ML [2]. Have I overlook something.
[1] https://patchwork.ozlabs.org/project/uboot/list/
[2] https://lists.denx.de/pipermail/u-boot/2018-May/date.html
I think I'm subscribed to U-boot mailing list with only one of my email addresses. The messages arriving from another one are delayed a bit since they have to be approved by moderators.
Thanks,
Eugeniu.
PATCH v2 1/6 kconfig: re-sync with Linux 4.17-rc4
In reply to Eugeniu Rosca2018-05-13 4:17 GMT+09:00 Eugeniu Rosca <[email protected]>:
Quoted 71 lines
Hello Petr,
Quoted 16 lines · Petr Vorel
Hi Eugeniu,
Quoted 5 lines
My testing was limited to:
- make defconfig all
- make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu-r8a7795_ulcb_defconfigall
- comparing .config before and after the re-sync
- running the newly importedKconfigunit tests as seen below:I tested whole patch-set with the other options:
make config
make defconfig
make menuconfig
make xconfig
make gconfig
make oldconfigQuoted 3 lines
Quoted 2 lines
Reviewed-by Masahiro Yamada <[email protected]>Signed-off-by Eugeniu Rosca <[email protected]>Tested-by Petr Vorel <[email protected]>Many thanks for testing!
Quoted 20 lines
Quoted 18 lines
$ make testconfig============================= 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%]Quoted 1 line
========================== 14 passed in 0.34 seconds ==========================
Quoted 4 lines
When applied all 6 patches, I got several errors (see bellow). I tested in on 2 distros (Debian unstable and openSUSE Tumbleweed). The code I applied is here, did I make error when applying patches?
https://github.com/pevik/u-boot/tree/eugeniu/kconfig.v2I checked your branch and got some interesting conclusions. Here is the diff between my and your version of commit ("kconfig:
re-sync with Linux 4.17-rc4"):$ git diff <eugeniu> <petr> scripts/kconfig/tests/auto_submenu/expected_stdout | 14 +++++++------- scripts/kconfig/tests/choice/oldask0_expected_stdout | 14 +++++++------- scripts/kconfig/tests/choice/oldask1_expected_stdout | 12 ++++++------ scripts/kconfig/tests/new_choice_with_dep/expected_stdout | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-)Here is the same diff ignoring whitespace:
$ git diff -w <eugeniu> <petr> scripts/kconfig/tests/auto_submenu/expected_stdout | 0 scripts/kconfig/tests/choice/oldask0_expected_stdout | 0 scripts/kconfig/tests/choice/oldask1_expected_stdout | 0 scripts/kconfig/tests/new_choice_with_dep/expected_stdout | 0 4 files changed, 0 insertions(+), 0 deletions(-)
Quoted 7 lines
So, it seems like all the trailing white-space from above files disappeared on your branch, after applying the patches from the email client (who did this?...).
I didn't expect that trailing white-space to be of any value for the test results, but it turns out it is! With the whitespace removed, I can also reproduce the failures of "make testconfig".
Right.
Whitespaces are precious in the expected_stdout files. Do not rip them off.
Quoted 7 lines
I am not familiar with pytest, but, based on what we see here, it looks like every single character stored in
*xpected_stdoutfiles (including whitespace at the end of lines) matters for the test to pass.I wonder if
Kconfigcould avoid printing whitespace in command line user dialogs. Then maybe those space characters could be removed from the "*xpected_stdout" files.
'make config' display a space at the end of line when prompting user input.
This makes the input readable, like follows:
*
* Linux/x86 4.17.0-rc4 Kernel Configuration
*
64-bit kernel (64BIT) [Y/n/?] y
*
* General setup
*
Cross-compiler tool prefix (CROSS_COMPILE) []
Compile also drivers which will not load (COMPILE_TEST) [N/y/?] y
I think you are suggesting to remove a space, like follows:
*
* Linux/x86 4.17.0-rc4 Kernel Configuration
*
64-bit kernel (64BIT) [Y/n/?]y
*
* General setup
*
Cross-compiler tool prefix (CROSS_COMPILE) []
Compile also drivers which will not load (COMPILE_TEST) [N/y/?]y
I believe we should not do this
just for unit-testing.
Quoted 10 lines
Masahiro?
Thanks again!
Best regards,
Eugeniu.
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH v2 1/6 kconfig: re-sync with Linux 4.17-rc4
Quoted 36 lines · Masahiro Yamada
2018-05-13 4:17 GMT+09:00 Eugeniu Rosca <[email protected]>:
Quoted 3 lines
I wonder if
Kconfigcould avoid printing whitespace in command line user dialogs. Then maybe those space characters could be removed from the "*xpected_stdout" files.'make config' display a space at the end of line when prompting user input.
This makes the input readable, like follows:
*
* Linux/x86 4.17.0-rc4 Kernel Configuration
*
64-bit kernel (64BIT) [Y/n/?] y
*
* General setup
*
Cross-compiler tool prefix (CROSS_COMPILE) []
Compile also drivers which will not load (COMPILE_TEST) [N/y/?] yI think you are suggesting to remove a space, like follows:
*
* Linux/x86 4.17.0-rc4 Kernel Configuration
*
64-bit kernel (64BIT) [Y/n/?]y
*
* General setup
*
Cross-compiler tool prefix (CROSS_COMPILE) []
Compile also drivers which will not load (COMPILE_TEST) [N/y/?]y
Quoted 2 lines
I believe we should not do this
just for unit-testing.
Chopped output will hurt user experience, so I agree it's not a solution to eliminate trailing whitespace in predefined stdout files for pytest.
Thank you,
Eugeniu.
PATCH v2 1/6 kconfig: re-sync with Linux 4.17-rc4
In reply to Masahiro YamadaHi Eugeniu, Masahiro,
Quoted 4 lines
Quoted 3 lines
So, it seems like all the trailing white-space from above files disappeared on your branch, after applying the patches from the email client (who did this?...).
Quoted 17 lines
Quoted 3 lines
I didn't expect that trailing white-space to be of any value for the test results, but it turns out it is! With the whitespace removed, I can also reproduce the failures of "make testconfig".
Right.
Whitespaces are precious in theexpected_stdoutfiles. Do not rip them off.Quoted 7 lines
I am not familiar with pytest, but, based on what we see here, it looks like every single character stored in
*xpected_stdoutfiles (including whitespace at the end of lines) matters for the test to pass.I wonder if
Kconfigcould avoid printing whitespace in command line user dialogs. Then maybe those space characters could be removed from the "*xpected_stdout" files.
BTW this topic is more for linux-kbuild, than u-boot.
Quoted 32 lines
'make config' display a space at the end of line when prompting user input.
This makes the input readable, like follows:
*
* Linux/x86 4.17.0-rc4 Kernel Configuration
*
64-bit kernel (64BIT) [Y/n/?] y
*
* General setup
*
Cross-compiler tool prefix (CROSS_COMPILE) []
Compile also drivers which will not load (COMPILE_TEST) [N/y/?] yI think you are suggesting to remove a space, like follows:
*
* Linux/x86 4.17.0-rc4 Kernel Configuration
*
64-bit kernel (64BIT) [Y/n/?]y
*
* General setup
*
Cross-compiler tool prefix (CROSS_COMPILE) []
Compile also drivers which will not load (COMPILE_TEST) [N/y/?]y
Quoted 2 lines
I believe we should not do this
just for unit-testing.
Yes, that wouldn't make sense.
I just have to be careful when applying patches :)
Quoted 6 lines
Quoted 6 lines
Masahiro?
Thanks again!
Best regards,
Eugeniu.
Kind regards,
Petr
PATCH v2 1/6 kconfig: re-sync with Linux 4.17-rc4
In reply to Eugeniu Rosca2018-05-13 2:13 GMT+09:00 Eugeniu Rosca <[email protected]>:
Quoted 222 lines
Align
Kconfigto Linux 4.17-rc4 with minimal impact on non-kconfig files.Previous
Kconfigsync was done by commitbf7ab1e70fd762("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: removescripts/multiconfig.sh")
[B] v2015.0720c20826efab("Kconfig: Enable usage of escape char '\' in string values")
[C] v2016.01da58dec86616("Various Makefiles: Add SPDX-License-Identifier tags")
[D] v2016.035b8031ccb4ed("Add more SPDX-License-Identifier tags")
[E] v2016.03192bc6948b02("Fix GCC format-security errors and convert sprintfs.")Here is the list of
Kconfigcommits which followed the v4.10 alignment:[F] v2018.01
0931ed3c0d0f("kconfig/symbol.c: use correct pointer type argument for sizeof")
[G] v2018.031414e09b4f25("kconfig: revert change that was not needed for -Wformat-security")
[H] v2018.0583d290c56fab("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
Kconfigdiverge from LinuxKconfigis commit [B]. After a brief analysis, the purpose of [B] seems to be placing "\n" literals in string symbols likeCONFIG_AUTOBOOT_PROMPT="autobootin %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 furtherKconfigalignment and backporting efforts, it is highly desired that commits like [B] are propagated to Linux and anyKconfigfixes/features are contributed to Linux kernel first. This specificKconfigre-sync just keeps [B] in place.Contrary to 4.10
Kconfigre-sync (which achieves zero non-kconfig changes), 4.17-rc4 re-sync does some amount of updates inKbuild(striving to keep them at minimum), due to a number of reasons:
*Kbuildis affected by the removal ofKconfig"*shipped" files and now requires flex and bison pre-installed on the host.
* PYTHON{2,3} variables are defined in top-levelMakefileas prerequisite for running the newly developedKconfigunit 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)")
911a91c39cabcbH ("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-levelMakefile")833e622459432eH ("genksyms: generate lexer and parser during build instead of shipping")b23d1a241f4eb4H ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically")e9781b52d4e0e3H ("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
Kconfigupdate 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
Kconfigre-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-levelMakefile")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
Kconfigupdate generates below build-time warnings:
YACCscripts/dtc/dtc-parser.tab.hscripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]
YACCscripts/dtc/dtc-parser.tab.cscripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr]This seems to happen because the
Kbuildupdates 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 commit833e622459432e("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 commit9130ba88464032("scripts/dtc:
Update to upstream version v1.4.6-9-gaadd0b65c987"). Whether fixing the DTC-related yacc warnings should be done together with theKconfigre-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_defconfigall
- comparing .config before and after the re-sync
- running the newly importedKconfigunit tests as seen below:$ make testconfig============================= 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 ==========================
Reviewed-by Masahiro Yamada <[email protected]>Signed-off-by Eugeniu Rosca <[email protected]>
Quoted 8 lines
---
v1->v2:
* Re-picked v4.16-rc1 commitcedd55d49dee("kconfig: Remove silentoldconfig from help and docs; fix kconfig/conf's help") with correct conflict resolution inscripts/kconfig/Makefile.
* Added: Reviewed-by: Masahiro Yamada <[email protected]
Reminder of Tom:
Patchwork is so confused that
it inserted Petr's Tested-by tag to a weird place. If you take this patch from Patchwork, please adjust the location of the tag.
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH v2 1/6 kconfig: re-sync with Linux 4.17-rc4
Hi Eugeniu,
Quoted 6 lines
2018-05-13 2:13 GMT+09:00 Eugeniu Rosca <[email protected]>:
Quoted 5 lines
Align
Kconfigto Linux 4.17-rc4 with minimal impact on non-kconfig files.Previous
Kconfigsync was done by commitbf7ab1e70fd762("kconfig:
re-sync with Linux 4.10") and it achieved almost perfect alignment with a few (intended) exceptions, caused by below U-boot commits:
Maybe it's again something wrong with my patch, but it broke 2 builds in travis:
https://travis-ci.org/pevik/u-boot/builds/379302139
It's this branch (make testconfig works on it):
https://github.com/pevik/u-boot/commits/eugeniu/kconfig.v2.test
Kind regards,
Petr
PATCH v2 1/6 kconfig: re-sync with Linux 4.17-rc4
Hi Petr,
Quoted 9 lines · Petr Vorel
Hi Eugeniu,
Quoted 6 lines
2018-05-13 2:13 GMT+09:00 Eugeniu Rosca <[email protected]>:
Quoted 5 lines
Align
Kconfigto Linux 4.17-rc4 with minimal impact on non-kconfig files.Previous
Kconfigsync was done by commitbf7ab1e70fd762("kconfig:
re-sync with Linux 4.10") and it achieved almost perfect alignment with a few (intended) exceptions, caused by below U-boot commits:
Quoted 5 lines
Maybe it's again something wrong with my patch, but it broke 2 builds in travis:
https://travis-ci.org/pevik/u-boot/builds/379302139It's this branch (make testconfig works on it):
https://github.com/pevik/u-boot/commits/eugeniu/kconfig.v2.test
Our branches match, so it's not the root cause this time. I will start looking into this. Thanks for reporting. I hope we provide a flawless Kconfig update to the users.
Quoted 2 lines
Kind regards,
Petr
Best regards,
Eugeniu.
PATCH v2 1/6 kconfig: re-sync with Linux 4.17-rc4
Hi Petr, Masahiro, Simon,
Quoted 15 lines · Eugeniu Rosca
Hi Petr,
Quoted 12 lines · Petr Vorel
Hi Eugeniu,
Quoted 6 lines
2018-05-13 2:13 GMT+09:00 Eugeniu Rosca <[email protected]>:
Quoted 5 lines
Align
Kconfigto Linux 4.17-rc4 with minimal impact on non-kconfig files.Previous
Kconfigsync was done by commitbf7ab1e70fd762("kconfig:
re-sync with Linux 4.10") and it achieved almost perfect alignment with a few (intended) exceptions, caused by below U-boot commits:Maybe it's again something wrong with my patch, but it broke 2 builds in travis:
https://travis-ci.org/pevik/u-boot/builds/379302139
Quoted 6 lines
Quoted 2 lines
It's this branch (make testconfig works on it):
https://github.com/pevik/u-boot/commits/eugeniu/kconfig.v2.testOur branches match, so it's not the root cause this time. I will start looking into this. Thanks for reporting. I hope we provide a flawless
Kconfigupdate to the users.
What I see both in [1] and [2] is failure of ut dm fdt_translation unit test in sandbox/sandbox_flattree environments. I can reproduce it myself with the delivered patch-set (see [3]), but cannot reproduce it on u-boot/master.
Doing basic bisecting, I can easily figure out that the issue is introduced by the last patch in the series, specifically commit ("sandbox: dts: test: Fix wrong aliases property names"). The patch fixing the issue is shown in [4]. The problem is no more reproduced afterwards, as seen in [5].
Please, feedback if you are fine with this level of analysis and the fix itself or maybe I should go deeper with investigation.
Anyway, based on above, the problem seems to be unrelated to the Kconfig/DTC update. Special thanks to Petr for reporting it.
Best regards,
Eugeniu.
[1] https://travis-ci.org/pevik/u-boot/jobs/379302204
[2] https://travis-ci.org/pevik/u-boot/jobs/379302206
[3] Reproducing the issue seen in [1] and [2] in sandbox:
$ ./u-boot -d arch/sandbox/dts/test.dtb
U-Boot 2018.05-00230-ge8e03803af5b (May 16 2018 - 13:09:51 +0200)
Model: sandbox DRAM: 128 MiB MMC: mmc2: 2 (SD), mmc1: 1 (SD), mmc0: 0 (SD) In: serial Out: vidconsole Err: vidconsole Model: sandbox SCSI: Net: eth0: eth at 10002000, eth5: eth at 10003000, eth3: sbe5, eth1: eth at 10004000 IDE: Bus 0: not available Hit any key to stop autoboot: 0
=> ut dm fdt_translation
Test: dm_test_fdt_translation: test-fdt.ctest/dm/test-fdt.c:444, dm_test_fdt_translation(): 0 == uclass_find_device_by_seq(UCLASS_TEST_DUMMY, 0, 1, &dev): Expected 0, got -19
Test: dm_test_fdt_translation: test-fdt.c (flat tree)test/dm/test-fdt.c:444, dm_test_fdt_translation(): 0 == uclass_find_device_by_seq(UCLASS_TEST_DUMMY, 0, 1, &dev): Expected 0, got -19
Failures: 2
=>
[4] Patch fixing [3].
test/dm/test-fdt.c +1 -1
@@ -425,7 +425,7 @@ static const struct udevice_id fdt_dummy_ids[] = { };UCLASS_DRIVER (fdt_dummy) = { - .name ="fdt_dummy" , + .name ="fdt-dummy" , .id =UCLASS_TEST_DUMMY , .flags =DM_UC_FLAG_SEQ_ALIAS , };
[5] The issue is healed after applying [4]:
$ ./u-boot -d arch/sandbox/dts/test.dtb
U-Boot 2018.05-00230-ge8e03803af5b-dirty (May 16 2018 - 13:15:13 +0200)
Model: sandbox DRAM: 128 MiB MMC: mmc2: 2 (SD), mmc1: 1 (SD), mmc0: 0 (SD) In: serial Out: vidconsole Err: vidconsole Model: sandbox SCSI: Net: eth0: eth at 10002000, eth5: eth at 10003000, eth3: sbe5, eth1: eth at 10004000 IDE: Bus 0: not available Hit any key to stop autoboot: 0
=> ut dm fdt_translation
Test: dm_test_fdt_translation: test-fdt.c
Test: dm_test_fdt_translation: test-fdt.c (flat tree)
Failures: 0
=>
PATCH v2 1/6 kconfig: re-sync with Linux 4.17-rc4
Dear reviewers,
Please, have a look at v3 series. TIA!
Best regards,
Eugeniu.
Quoted 106 lines · Eugeniu Rosca
Hi Petr, Masahiro, Simon,
Quoted 15 lines · Eugeniu Rosca
Hi Petr,
Quoted 12 lines · Petr Vorel
Hi Eugeniu,
Quoted 6 lines
2018-05-13 2:13 GMT+09:00 Eugeniu Rosca <[email protected]>:
Quoted 5 lines
Align
Kconfigto Linux 4.17-rc4 with minimal impact on non-kconfig files.Previous
Kconfigsync was done by commitbf7ab1e70fd762("kconfig:
re-sync with Linux 4.10") and it achieved almost perfect alignment with a few (intended) exceptions, caused by below U-boot commits:Maybe it's again something wrong with my patch, but it broke 2 builds in travis:
https://travis-ci.org/pevik/u-boot/builds/379302139Quoted 6 lines
Quoted 2 lines
It's this branch (make testconfig works on it):
https://github.com/pevik/u-boot/commits/eugeniu/kconfig.v2.testOur branches match, so it's not the root cause this time. I will start looking into this. Thanks for reporting. I hope we provide a flawless
Kconfigupdate to the users.What I see both in [1] and [2] is failure of
ut dm fdt_translationunit test in sandbox/sandbox_flattree environments. I can reproduce it myself with the delivered patch-set (see [3]), but cannot reproduce it on u-boot/master.Doing basic bisecting, I can easily figure out that the issue is introduced by the last patch in the series, specifically commit ("sandbox: dts: test: Fix wrong aliases property names"). The patch fixing the issue is shown in [4]. The problem is no more reproduced afterwards, as seen in [5].
Please, feedback if you are fine with this level of analysis and the fix itself or maybe I should go deeper with investigation.
Anyway, based on above, the problem seems to be unrelated to the Kconfig/DTC update. Special thanks to Petr for reporting it.
Best regards,
Eugeniu.[1] https://travis-ci.org/pevik/u-boot/jobs/379302204
[2] https://travis-ci.org/pevik/u-boot/jobs/379302206[3] Reproducing the issue seen in [1] and [2] in sandbox:
$ ./u-boot -d arch/sandbox/dts/test.dtbU-Boot 2018.05-00230-ge8e03803af5b (May 16 2018 - 13:09:51 +0200)
Model: sandbox DRAM: 128 MiB MMC: mmc2: 2 (SD), mmc1: 1 (SD), mmc0: 0 (SD) In: serial Out: vidconsole Err: vidconsole Model: sandbox SCSI: Net: eth0: eth at 10002000, eth5: eth at 10003000, eth3: sbe5, eth1: eth at 10004000 IDE: Bus 0: not available Hit any key to stop autoboot: 0=> ut dm
fdt_translation
Test:dm_test_fdt_translation:test-fdt.ctest/dm/test-fdt.c:444,dm_test_fdt_translation(): 0 ==uclass_find_device_by_seq(UCLASS_TEST_DUMMY, 0, 1, &dev): Expected 0, got -19
Test:dm_test_fdt_translation:test-fdt.c(flat tree)test/dm/test-fdt.c:444,dm_test_fdt_translation(): 0 ==uclass_find_device_by_seq(UCLASS_TEST_DUMMY, 0, 1, &dev): Expected 0, got -19
Failures: 2
=>[4] Patch fixing [3].
test/dm/test-fdt.c +1
-1@@ -425,7 +425,7 @@ static const struct udevice_id fdt_dummy_ids[] = { };UCLASS_DRIVER (fdt_dummy) = { - .name ="fdt_dummy" , + .name ="fdt-dummy" , .id =UCLASS_TEST_DUMMY , .flags =DM_UC_FLAG_SEQ_ALIAS , };[5] The issue is healed after applying [4]:
$ ./u-boot -d arch/sandbox/dts/test.dtbU-Boot 2018.05-00230-ge8e03803af5b-dirty (May 16 2018 - 13:15:13 +0200)
Model: sandbox DRAM: 128 MiB MMC: mmc2: 2 (SD), mmc1: 1 (SD), mmc0: 0 (SD) In: serial Out: vidconsole Err: vidconsole Model: sandbox SCSI: Net: eth0: eth at 10002000, eth5: eth at 10003000, eth3: sbe5, eth1: eth at 10004000 IDE: Bus 0: not available Hit any key to stop autoboot: 0=> ut dm
fdt_translation
Test:dm_test_fdt_translation:test-fdt.c
Test:dm_test_fdt_translation:test-fdt.c(flat tree)
Failures: 0
=>