From: Simon Glass <sjg@chromium.org>
Date: Sat, 18 Apr 2020 00:08:57 +0000 (-0600)
Subject: dtoc: Rename the main module
X-Git-Tag: v2020.07-rc1~5^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d25fe2d952dd66d0f6c3f0dfdd4303e85d65333;p=thirdparty%2Fu-boot.git

dtoc: Rename the main module

Python does not like the module name being the same as the module
directory. To allow dtoc modules to be used from other tools, rename
it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/tools/dtoc/dtoc b/tools/dtoc/dtoc
index 896ca44e62f..11a5d8e18ab 120000
--- a/tools/dtoc/dtoc
+++ b/tools/dtoc/dtoc
@@ -1 +1 @@
-dtoc.py
\ No newline at end of file
+main.py
\ No newline at end of file
diff --git a/tools/dtoc/dtoc.py b/tools/dtoc/main.py
similarity index 98%
rename from tools/dtoc/dtoc.py
rename to tools/dtoc/main.py
index 8e05b434318..b1eee21f174 100755
--- a/tools/dtoc/dtoc.py
+++ b/tools/dtoc/main.py
@@ -77,7 +77,7 @@ def run_tests(args):
 def RunTestCoverage():
     """Run the tests and check that we get 100% coverage"""
     sys.argv = [sys.argv[0]]
-    test_util.RunTestCoverage('tools/dtoc/dtoc.py', '/dtoc.py',
+    test_util.RunTestCoverage('tools/dtoc/dtoc', '/main.py',
             ['tools/patman/*.py', '*/fdt*', '*test*'], options.build_dir)