aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-11-10 21:19:37 -0500
committerTom Rini <trini@konsulko.com>2019-11-23 14:53:48 -0500
commit02b5670e65ae28d01dd8883968a2feddb77095b2 (patch)
treeb44ca68b3d7eafa06f457eb94f04fd789d8550cd /tools
parent66b3ccc8f7d82afc568e66092aa7630428ad7750 (diff)
downloadu-boot-02b5670e65ae28d01dd8883968a2feddb77095b2.zip
u-boot-02b5670e65ae28d01dd8883968a2feddb77095b2.tar.gz
u-boot-02b5670e65ae28d01dd8883968a2feddb77095b2.tar.bz2
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>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/moveconfig.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/moveconfig.py b/tools/moveconfig.py
index e2ff4cf..36160a3 100755
--- a/tools/moveconfig.py
+++ b/tools/moveconfig.py
@@ -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)