u-boot.git/tools/moveconfig.py, branch v2016.09-rc2

tools: moveconfig: support CONFIG_SYS_EXTRA_OPTIONS cleaning

2016-08-05T11:27:18Z

We mostly move config options from board header files to Kconfig, but sometimes config defines come from CONFIG_SYS_EXTRA_OPTIONS. Historically, CONFIG_SYS_EXTRA_OPTIONS originates in boards.cfg, which was used as a central database of configuration prior to the Kconfig conversion. Now, we want to migrate to primary entries in Kconfig rather than option list in CONFIG_SYS_EXTRA_OPTIONS, so it should be helpful to have the tool to cleanup CONFIG_SYS_EXTRA_OPTIONS automatically. Signed-off-by: Masahiro Yamada Reviewed-by: Tom Rini

tools: moveconfig: make getting all defconfigs into helper function

2016-08-05T11:27:17Z

I want to reuse this routine in the next commit. Signed-off-by: Masahiro Yamada Reviewed-by: Tom Rini

tools: moveconfig: fix cleanup of defines across multiple lines

2016-08-05T11:27:17Z

Correct the clean-up of such defines that continue across multiple lines, like follows: #define CONFIG_FOO "this continues to the next line " \ "this line should be removed too" \ "this line should be removed as well" Signed-off-by: Masahiro Yamada Reviewed-by: Tom Rini

tools: moveconfig: show diffs of cleaned headers in color

2016-08-05T11:27:16Z

Show code diff in color if --color option is given. Signed-off-by: Masahiro Yamada Reviewed-by: Tom Rini

tools: moveconfig: show result of header cleaning in unified diff

2016-08-05T11:27:16Z

The header cleanup feature of this tool now removes empty ifdef's, successive blank lines as well as moved option defines. So, we want to see a little more context to check which lines were deleted. It is true that we can see it by "git diff", but it would not work in the --dry-run mode. So, here, this commit. Signed-off-by: Masahiro Yamada

tools: moveconfig: trim garbage lines after header cleanups

2016-08-05T11:27:16Z

The tools/moveconfig.py has a feature to cleanup #define/#undef's of moved config options, but I want this tool to do a better job. For example, when we are moving CONFIG_FOO and its define is surrounded by #ifdef ... #endif, like follows: #ifdef CONFIG_BAR # define CONFIG_FOO #endif The header cleanup will leave empty #ifdef ... #endif: #ifdef CONFIG_BAR #endif Likewise, if a define line between two blank lines #define CONFIG_FOO

tools: moveconfig: do not check clean tree and compilers for -H option

2016-08-05T11:27:15Z

The clean tree (make mrproper) and compilers are required when moving config options, but not needed when we only cleanup headers. Signed-off-by: Masahiro Yamada Reviewed-by: Tom Rini

tools: moveconfig: do not cleanup headers in include/generated

2016-08-05T11:27:15Z

The files in include/generated are generated during build and removed by "make mrproper", so it has no point to touch them by this tool. Signed-off-by: Masahiro Yamada Reviewed-by: Tom Rini

tools: moveconfig: show suspicious boards with possible misconversion

2016-06-22T00:23:00Z

There are some cases where config options are moved, but they are ripped off at the final savedefconfig stage: - The moved option is not user-configurable, for example, due to a missing prompt in the Kconfig entry - The config was not defined in the original config header despite the Kconfig specifies it as non-bool type - The config define in the header contains reference to another macro, for example: #define CONFIG_CONS_INDEX (CONFIG_SYS_LPC32XX_UART - 2) The current moveconfig does not support recursive macro expansion. In these cases, the conversion is very likely to be an unexpected result. That is why I decided to display the log in yellow color in commit 5da4f857beac ("tools: moveconfig: report when CONFIGs are removed by savedefconfig"). It would be nice to display the list of suspicious boards when the tool finishes processing. It is highly recommended to check the defconfigs once again when this message is displayed. Signed-off-by: Masahiro Yamada Reviewed-by: Joe Hershberger

tools: moveconfig: simplify show_failed_boards() and show more info

2016-06-22T00:22:54Z

Since commit 1d085568b3de ("tools: moveconfig: display log atomically in more readable format"), the function color_text() is clever enough to exclude LF from escape sequences. Exploit it for removing the "for" loops from Slots.show_failed_boards(). Also, display "(the list has been saved in moveconfig.failed)" if there are failed boards. Signed-off-by: Masahiro Yamada Reviewed-by: Joe Hershberger