michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: build: update gen_relocate_app.py to use new argument separators

Browse source 
Update gen_relocate_app.py to use "|" to separate code relocation
directives, and ";" to separate multiple files in a relocation directive.
This will enable multiple files to be passed to zephyr_code_relocate,
as well as multiple files to be passed from a CMake generator expression.
The script will then seperate these files and relocate each according to
the arguments given to zephyr_code_relocate.

Note! This commit will break support for zephyr_code_relocate until
the CMake function is updated

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
This commit is contained in:
Daniel DeGrasse 2022-10-04 18:34:25 -05:00 • committed by Carles Cufí
commit ca14626120
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
scripts/build/gen_relocate_app.py
View file

@ -464,24 +464,35 @@ def create_dict_wrt_mem():
if args.input_rel_dict == '':
sys.exit("Disable CONFIG_CODE_DATA_RELOCATION if no file needs relocation")
for line in args.input_rel_dict.split(';'):
for line in args.input_rel_dict.split('|'):
if ':' not in line:
continue
mem_region, phdr, copy_flag, file_name = parse_input_string(line)
mem_region, phdr, copy_flag, file_list = parse_input_string(line)
# Handle any program header
if phdr != '':
phdrs[mem_region] = f':{phdr}'
file_name_list = glob.glob(file_name)
if not file_name_list:
warnings.warn("File: "+file_name+" Not found")
# Split file names by semicolons, to support generator expressions
file_glob_list = file_list.split(';')
file_name_list = []
# Use glob matching on each file in the list
for file_glob in file_glob_list:
glob_results = glob.glob(file_glob)
if not glob_results:
warnings.warn("File: "+file_glob+" Not found")
continue
elif len(glob_results) > 1:
warnings.warn("Regex in file lists is deprecated, please use file(GLOB) instead")
file_name_list.extend(glob_results)
if len(file_name_list) == 0:
warnings.warn("No files in string: "+file_list+" found")
continue
if mem_region == '':
continue
if args.verbose:
print("Memory region ", mem_region, " Selected for file:", file_name_list)
print("Memory region ", mem_region, " Selected for files:", file_name_list)
mem_region = "|".join((mem_region, copy_flag))