zephyr: update devicetree py package lib files include path in assembly (23c9c430) · Commits · Wenxi XU / Mcuboot

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 ) Signed-off-by:

Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

scripts/assemble.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -127,14 +127,14 @@ def main():
		print('Need to either have ZEPHYR_BASE in environment or pass in -z')
		sys.exit(1)

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

		board = find_board_name(args.bootdir)

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

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

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

Admin message