Skip to content

Commit 71eff10

Browse files
Oren CohenMichael Schwarcz
authored andcommitted
Build system fix
1 parent c94b065 commit 71eff10

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

tools/spm/generate_partition_code.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ def __eq__(self, other):
271271
)
272272

273273
@classmethod
274-
def from_json(cls, manifest_file):
274+
def from_json(cls, manifest_file, skip_src=False):
275275
"""
276276
Load a partition manifest file
277277
@@ -294,9 +294,10 @@ def from_json(cls, manifest_file):
294294
manifest_dir = os.path.dirname(manifest_file)
295295

296296
source_files = []
297-
for src_file in manifest['source_files']:
298-
source_files.append(
299-
os.path.normpath(path_join(manifest_dir, src_file)))
297+
if not skip_src:
298+
for src_file in manifest['source_files']:
299+
source_files.append(
300+
os.path.normpath(path_join(manifest_dir, src_file)))
300301

301302
mmio_regions = []
302303
for mmio_region in manifest.get('mmio_regions', []):
@@ -356,11 +357,11 @@ def is_up_to_date(self, template_files):
356357

357358
def find_dependencies(self, manifests):
358359
"""
359-
Find other manifests which holds Secure functions that
360+
Find other manifests which holds Secure functions that
360361
are declared as extern in this manifest
361362
362363
:param manifests: list of manifests to filter
363-
:return: list of manifest's names that holds current
364+
:return: list of manifest's names that holds current
364365
extern secure functions
365366
"""
366367

@@ -672,7 +673,7 @@ def generate_spm_data(manifest_files, output_dir, extra_filters=None):
672673
region_list = []
673674
manifests = []
674675
for manifest_file in manifest_files:
675-
manifest_obj = Manifest.from_json(manifest_file)
676+
manifest_obj = Manifest.from_json(manifest_file, skip_src=True)
676677
for region in manifest_obj.mmio_regions:
677678
region_list.append(region)
678679
manifests.append(manifest_obj)

0 commit comments

Comments
 (0)