[RFC PATCH 1/2] kconfig: Bring in from Linux v6.2

Bin Meng bmeng.cn at gmail.com
Mon Mar 13 05:48:14 CET 2023


On Sun, Mar 12, 2023 at 8:05 AM Simon Glass <sjg at chromium.org> wrote:
>
> Bring in this code wholesale, replacing the old U-Boot code.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
>  scripts/kconfig/.gitignore                    |   20 +-
>  scripts/kconfig/Makefile                      |  211 ++--
>  scripts/kconfig/conf.c                        |  499 +++++---
>  scripts/kconfig/confdata.c                    | 1074 ++++++++--------
>  scripts/kconfig/expr.c                        |   30 +-
>  scripts/kconfig/expr.h                        |   17 +-
>  scripts/kconfig/gconf-cfg.sh                  |   15 +-
>  scripts/kconfig/gconf.c                       |   47 +-
>  scripts/kconfig/images.c                      |   34 +-
>  scripts/kconfig/images.h                      |   33 +
>  scripts/kconfig/internal.h                    |    9 +
>  scripts/kconfig/kconf_id.c                    |   52 -
>  scripts/kconfig/{zconf.l => lexer.l}          |  247 ++--
>  scripts/kconfig/list.h                        |    2 +-
>  scripts/kconfig/lkc.h                         |   91 +-
>  scripts/kconfig/lkc_proto.h                   |   22 +-
>  scripts/kconfig/lxdialog/.gitignore           |    4 -
>  scripts/kconfig/lxdialog/BIG.FAT.WARNING      |    2 +-
>  scripts/kconfig/lxdialog/inputbox.c           |    3 +-
>  scripts/kconfig/lxdialog/util.c               |    4 +-
>  scripts/kconfig/mconf-cfg.sh                  |   36 +-
>  scripts/kconfig/mconf.c                       |   42 +-
>  scripts/kconfig/menu.c                        |  263 ++--
>  scripts/kconfig/merge_config.sh               |   75 +-
>  scripts/kconfig/nconf-cfg.sh                  |   32 +-
>  scripts/kconfig/nconf.c                       |   89 +-
>  scripts/kconfig/nconf.gui.c                   |  292 ++---
>  scripts/kconfig/nconf.h                       |   56 +-
>  scripts/kconfig/{zconf.y => parser.y}         |  336 ++---
>  scripts/kconfig/preprocess.c                  |   12 +-
>  scripts/kconfig/qconf-cfg.sh                  |   29 +-
>  scripts/kconfig/qconf.cc                      | 1106 +++++++++--------
>  scripts/kconfig/qconf.h                       |  163 +--
>  scripts/kconfig/streamline_config.pl          |   98 +-
>  scripts/kconfig/symbol.c                      |  106 +-
>  scripts/kconfig/tests/auto_submenu/Kconfig    |    2 +
>  .../kconfig/tests/auto_submenu/__init__.py    |    1 +
>  scripts/kconfig/tests/choice/Kconfig          |    4 +-
>  scripts/kconfig/tests/choice/__init__.py      |    1 +
>  .../tests/choice_value_with_m_dep/Kconfig     |    4 +-
>  .../tests/choice_value_with_m_dep/__init__.py |    1 +
>  scripts/kconfig/tests/conftest.py             |    4 +
>  .../tests/err_recursive_dep/expected_stderr   |   14 +-
>  .../kconfig/tests/err_recursive_inc/Kconfig   |    1 +
>  .../tests/err_recursive_inc/Kconfig.inc1      |    1 +
>  .../tests/err_recursive_inc/Kconfig.inc2      |    1 +
>  .../tests/err_recursive_inc/Kconfig.inc3      |    1 +
>  .../tests/err_recursive_inc/__init__.py       |    1 +
>  .../tests/err_recursive_inc/expected_stderr   |    6 +-
>  scripts/kconfig/tests/inter_choice/Kconfig    |    4 +-
>  .../kconfig/tests/inter_choice/__init__.py    |    1 +
>  .../kconfig/tests/new_choice_with_dep/Kconfig |    2 +
>  .../tests/new_choice_with_dep/__init__.py     |    1 +
>  .../tests/no_write_if_dep_unmet/Kconfig       |    2 +
>  .../tests/no_write_if_dep_unmet/__init__.py   |    1 +
>  .../tests/preprocess/builtin_func/Kconfig     |   27 +
>  .../tests/preprocess/builtin_func/__init__.py |    9 +
>  .../preprocess/builtin_func/expected_stderr   |    5 +
>  .../preprocess/builtin_func/expected_stdout   |    1 +
>  .../preprocess/circular_expansion/Kconfig     |    5 +
>  .../preprocess/circular_expansion/__init__.py |   11 +
>  .../circular_expansion/expected_stderr        |    1 +
>  .../kconfig/tests/preprocess/escape/Kconfig   |   44 +
>  .../tests/preprocess/escape/__init__.py       |    8 +
>  .../tests/preprocess/escape/expected_stderr   |   10 +
>  .../kconfig/tests/preprocess/variable/Kconfig |   53 +
>  .../tests/preprocess/variable/__init__.py     |    8 +
>  .../tests/preprocess/variable/expected_stderr |    9 +
>  .../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 -
>  scripts/kconfig/util.c                        |    5 +-
>  74 files changed, 2786 insertions(+), 2674 deletions(-)
>  create mode 100644 scripts/kconfig/images.h
>  create mode 100644 scripts/kconfig/internal.h
>  delete mode 100644 scripts/kconfig/kconf_id.c
>  rename scripts/kconfig/{zconf.l => lexer.l} (67%)
>  delete mode 100644 scripts/kconfig/lxdialog/.gitignore
>  mode change 100644 => 100755 scripts/kconfig/nconf-cfg.sh
>  rename scripts/kconfig/{zconf.y => parser.y} (70%)
>  create mode 100644 scripts/kconfig/tests/preprocess/builtin_func/Kconfig
>  create mode 100644 scripts/kconfig/tests/preprocess/builtin_func/__init__.py
>  create mode 100644 scripts/kconfig/tests/preprocess/builtin_func/expected_stderr
>  create mode 100644 scripts/kconfig/tests/preprocess/builtin_func/expected_stdout
>  create mode 100644 scripts/kconfig/tests/preprocess/circular_expansion/Kconfig
>  create mode 100644 scripts/kconfig/tests/preprocess/circular_expansion/__init__.py
>  create mode 100644 scripts/kconfig/tests/preprocess/circular_expansion/expected_stderr
>  create mode 100644 scripts/kconfig/tests/preprocess/escape/Kconfig
>  create mode 100644 scripts/kconfig/tests/preprocess/escape/__init__.py
>  create mode 100644 scripts/kconfig/tests/preprocess/escape/expected_stderr
>  create mode 100644 scripts/kconfig/tests/preprocess/variable/Kconfig
>  create mode 100644 scripts/kconfig/tests/preprocess/variable/__init__.py
>  create mode 100644 scripts/kconfig/tests/preprocess/variable/expected_stderr
>  delete mode 100644 scripts/kconfig/tests/rand_nested_choice/Kconfig
>  delete mode 100644 scripts/kconfig/tests/rand_nested_choice/__init__.py
>  delete mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout0
>  delete mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout1
>  delete mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout2
>

Tested building qemu-x86 and qemu-riscv_spl, and boot on QEMU
Tested-by: Bin Meng <bmeng.cn at gmail.com>


More information about the U-Boot mailing list