[v2,05/49] binman: Correct the search patch for pylibfdt

Message ID 20200613205717.v2.5.Ifa800055795ac558a5c26ce7f6a7a6a0094981d7@changeid
State Accepted
Commit 5d8b3384621a830f7acea4238b0bb555b857e058
Headers show
Series
  • rockchip: x86: Support building ROM files automatically with binman
Related show

Commit Message

Simon Glass June 14, 2020, 2:56 a.m.
Now that binman uses tools/ as its base directory for importing modules,
the path to the pylibfdt build by U-Boot is incorrect. Fix it with a new
path.

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

Changes in v2:
- Leave the old (object-directory) path in place

 tools/binman/main.py | 1 +
 1 file changed, 1 insertion(+)

Comments

Bin Meng June 29, 2020, 6:21 a.m. | #1
On Sun, Jun 14, 2020 at 10:57 AM Simon Glass <sjg at chromium.org> wrote:
>
> Now that binman uses tools/ as its base directory for importing modules,
> the path to the pylibfdt build by U-Boot is incorrect. Fix it with a new
> path.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
> Changes in v2:
> - Leave the old (object-directory) path in place
>
>  tools/binman/main.py | 1 +
>  1 file changed, 1 insertion(+)
>

Reviewed-by: Bin Meng <bmeng.cn at gmail.com>

Patch

diff --git a/tools/binman/main.py b/tools/binman/main.py
index 0ab2bb6206..6f5a9d1ca2 100755
--- a/tools/binman/main.py
+++ b/tools/binman/main.py
@@ -26,6 +26,7 @@  from patman import test_util
 
 # Bring in the libfdt module
 sys.path.insert(2, 'scripts/dtc/pylibfdt')
+sys.path.insert(2, os.path.join(our_path, '../../scripts/dtc/pylibfdt'))
 sys.path.insert(2, os.path.join(our_path,
                 '../../build-sandbox_spl/scripts/dtc/pylibfdt'))