OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

assemble: Allow use of ZEPHYR_BASE environment var 

Make `-z` flag optional, so if it is not provided rely on the
ZEPHYR_BASE environemnt variable to find the Zephyr tree.

Signed-off-by: Fabio Utzig <fabio.utzig@nordicsemi.no>
This commit is contained in:
Fabio Utzig 2020-07-10 09:26:14 -03:00 committed by Fabio Utzig
parent 8a99adf0c5
commit 6ec2ec32cb
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/assemble.py
View File

@ -22,6 +22,7 @@ import argparse
import errno import errno
import io import io
import re import re
import os
import os.path import os.path
import sys import sys
@ -111,19 +112,27 @@ def main():
help='Signed image file for secondary image') help='Signed image file for secondary image')
parser.add_argument('-o', '--output', required=True, parser.add_argument('-o', '--output', required=True,
help='Filename to write full image to') help='Filename to write full image to')
parser.add_argument('-z', '--zephyr-base', required=True, parser.add_argument('-z', '--zephyr-base',
help='Zephyr base containg the Zephyr repository') help='Zephyr base containing the Zephyr repository')
args = parser.parse_args() args = parser.parse_args()
sys.path.insert(0, os.path.join(args.zephyr_base, "scripts", "dts")) zephyr_base = args.zephyr_base
if zephyr_base is None:
try:
zephyr_base = os.environ['ZEPHYR_BASE']
except KeyError:
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 import edtlib
board = find_board_name(args.bootdir) board = find_board_name(args.bootdir)
dts_path = os.path.join(args.bootdir, "zephyr", board + ".dts.pre.tmp") dts_path = os.path.join(args.bootdir, "zephyr", board + ".dts.pre.tmp")
edt = edtlib.EDT(dts_path, [os.path.join(args.zephyr_base, "dts", "bindings")], edt = edtlib.EDT(dts_path, [os.path.join(zephyr_base, "dts", "bindings")],
warn_reg_unit_address_mismatch=False) warn_reg_unit_address_mismatch=False)
output = Assembly(args.output, args.bootdir, edt) output = Assembly(args.output, args.bootdir, edt)