From 020b9f147fcb18ceb84b2649b0122466fce2ebfc Mon Sep 17 00:00:00 2001 From: Alessandro Thea Date: Thu, 9 Feb 2023 12:52:41 +0100 Subject: [PATCH 1/2] Bugfix in vivado project generation --- src/ipbb/__init__.py | 2 +- src/ipbb/generators/vivadoproject.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ipbb/__init__.py b/src/ipbb/__init__.py index 9526bbe9..3ae1bc80 100644 --- a/src/ipbb/__init__.py +++ b/src/ipbb/__init__.py @@ -1,3 +1,3 @@ -__version__ = '1.0.a0+2022.dev8' +__version__ = '1.0.a0+2023.dev1' diff --git a/src/ipbb/generators/vivadoproject.py b/src/ipbb/generators/vivadoproject.py index 99dccdea..5d2dc817 100644 --- a/src/ipbb/generators/vivadoproject.py +++ b/src/ipbb/generators/vivadoproject.py @@ -174,7 +174,7 @@ def write(self, aOutput, aSettings, aComponentPaths, aCommandList, aLibs): if not set(lSrcCommandGroups.keys()).issubset(cmd_types): raise RuntimeError(f"Command group mismatch {' '.join(lSrcCommandGroups.keys())}") for t in cmd_types: - for c, f in lSrcCommandGroups[t].items(): + for c, f in lSrcCommandGroups.get(t,{}).items(): write(tmpl(c).substitute(files=' '.join(f))) write(f'set_property top {lTopEntity} [get_filesets sources_1]') From 28cd3aa18b33c3cfc288ae19a2fd7b83092a80b9 Mon Sep 17 00:00:00 2001 From: arose Date: Wed, 12 Jul 2023 17:03:55 +0100 Subject: [PATCH 2/2] Add handling of .coe files --- src/ipbb/generators/vivadoproject.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ipbb/generators/vivadoproject.py b/src/ipbb/generators/vivadoproject.py index 5d2dc817..8b02afa8 100644 --- a/src/ipbb/generators/vivadoproject.py +++ b/src/ipbb/generators/vivadoproject.py @@ -27,7 +27,7 @@ def fileset(aSrcCmd): name, ext = splitext(aSrcCmd.filepath) lFileSet = None - if ext in ('.xci', '.xcix'): + if ext in ('.xci', '.xcix', '.coe' ): lFileSet = 'sources_1' elif ext in ('.xdc', '.tcl'): @@ -114,7 +114,7 @@ def write(self, aOutput, aSettings, aComponentPaths, aCommandList, aLibs): # local list of commands lCommands = [] - if ext in ('.xci', '.xcix'): + if ext in ('.xci', '.xcix' , '.coe'): t = 'ip' c = f'import_files -norecurse -fileset {self.fileset(src)} $files'