Skip to content

Commit 23c9c43

Browse files
endiancjnvlsianpu
authored andcommitted
zephyr: update devicetree py package lib files include path in assembly
This PR updates the path to the devicetree python package lib files according to the Zephyr PR zephyrproject-rtos#33746 which moved the devicetree lib files. Old path: ZEPHYR_BASE/scripts/dts/ New path: ZEPHYR_BASE/scripts/dts/python-devicetree/src/devicetree/ Signed-off-by: Carl-Johan Landin <carl-johan.landin@endian.se> (cherry picked from commit f44fd61) Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
1 parent 26bbc18 commit 23c9c43

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

scripts/assemble.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,14 @@ def main():
127127
print('Need to either have ZEPHYR_BASE in environment or pass in -z')
128128
sys.exit(1)
129129

130-
sys.path.insert(0, os.path.join(zephyr_base, "scripts", "dts"))
131-
import edtlib
130+
sys.path.insert(0, os.path.join(zephyr_base, "scripts", "dts", "python-devicetree", "src"))
131+
import devicetree.edtlib
132132

133133
board = find_board_name(args.bootdir)
134134

135135
dts_path = os.path.join(args.bootdir, "zephyr", board + ".dts.pre.tmp")
136136

137-
edt = edtlib.EDT(dts_path, [os.path.join(zephyr_base, "dts", "bindings")],
137+
edt = devicetree.edtlib.EDT(dts_path, [os.path.join(zephyr_base, "dts", "bindings")],
138138
warn_reg_unit_address_mismatch=False)
139139

140140
output = Assembly(args.output, args.bootdir, edt)

0 commit comments

Comments
 (0)