diff --git a/tools/oneclick/base/hdl_config.py b/tools/oneclick/base/hdl_config.py index 55b90fba05ec6d5cce5d253debaedae892fcf4dc..c76635484368b92e9748895a2810976571ab9ddf 100644 --- a/tools/oneclick/base/hdl_config.py +++ b/tools/oneclick/base/hdl_config.py @@ -79,13 +79,6 @@ class HdlConfig: self.libs = common_dict_file.CommonDictFile(libRootDir, libFileName) # library dict files if self.libs.nof_dicts==0: sys.exit('Error : No HDL library config file found') - # Keep list of HDL library names - self.lib_names = self.libs.get_key_values('hdl_lib_name') - - # Check that there are no duplicate library names (eg. due to copying a hdlib.cfg without modifying the hdl_lib_name value) - duplicate_lib_names = cm.list_duplicates(self.lib_names) - if len(duplicate_lib_names)>0: sys.exit('Error : Duplicate HDL library config file found %s' % duplicate_lib_names) - # Keep the generic HDL libraries and remove those that do not match the specified IP technologies self.technologyNames = cm.listify(technologyNames) self.removed_dicts = [] @@ -96,6 +89,13 @@ class HdlConfig: for d in self.removed_dicts: self.libs.remove_dict_from_list(d) + # Keep list of HDL library names + self.lib_names = self.libs.get_key_values('hdl_lib_name') + + # Check that there are no duplicate library names (eg. due to copying a hdlib.cfg without modifying the hdl_lib_name value) + duplicate_lib_names = cm.list_duplicates(self.lib_names) + if len(duplicate_lib_names)>0: sys.exit('Error : Duplicate HDL library config file found %s' % duplicate_lib_names) + def derive_all_use_libs(self, lib_name): """Derive a list of all HDL libraries that the specified HDL lib_name library depends on.