moveconfig.py: Fix more Python3 UTF issues

With the move to using Python 3 for real, we encounter two different
issues.  First, the file include/video_font_data.h includes at least one
UTF-16 character.  Given that it does not include any CONFIG symbols it
is easiest to just ignore this file.  Next, we encounter similar
problems with some dts/dtsi files that come from Linux.  In this case
it's easiest to simply ignore all dts/dtsi files as there will not be
CONFIG symbols for us to migrate in them.

Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2019-11-10 21:19:37 -05:00
parent 66b3ccc8f7
commit 02b5670e65

View File

@ -667,8 +667,11 @@ def cleanup_headers(configs, options):
if dirpath == os.path.join('include', 'generated'):
continue
for filename in filenames:
if not fnmatch.fnmatch(filename, '*~'):
if not filename.endswith(('~', '.dts', '.dtsi')):
header_path = os.path.join(dirpath, filename)
# This file contains UTF-16 data and no CONFIG symbols
if header_path == 'include/video_font_data.h':
continue
cleanup_one_header(header_path, patterns, options)
cleanup_empty_blocks(header_path, options)