Fix support for PolarFireSoC devices

Author: rodrigomelo9

examples/projects/libero.py

@@ -6,7 +6,7 @@
 
 parser = argparse.ArgumentParser()
 parser.add_argument(
-    '--board', choices=['maker'], default='maker'
+    '--board', choices=['mpfs-disco-kit', 'maker'], default='mpfs-disco-kit'
 )
 parser.add_argument(
     '--source', choices=['vlog', 'vhdl', 'slog'], default='vlog'
@@ -21,6 +21,13 @@
 
 prj = Libero(odir=f'results/libero/{args.source}/{args.board}')
 
+
+if args.board == 'mpfs-disco-kit':
+    prj.set_part('MPFS095T-1-FCSG325E')
+    prj.add_param('FREQ', '50000000')
+    prj.add_cons('../sources/cons/mpfs-disco-kit/timing.sdc')
+    prj.add_cons('../sources/cons/mpfs-disco-kit/clk.pdc')
+    prj.add_cons('../sources/cons/mpfs-disco-kit/led.pdc')
 if args.board == 'maker':
     prj.set_part('m2s010-1-tq144')
     prj.add_param('FREQ', '125000000')

pyfpga/libero.py

@@ -31,9 +31,10 @@ def _make_custom(self):
         self.data['device'] = info['device']
         self.data['speed'] = info['speed']
         self.data['package'] = info['package']
+        self.data['prange'] = info['prange']
 
     def _prog_custom(self):
-        raise NotImplementedError('Libero programming not supported')
+        raise NotImplementedError('Libero programming not supported yet')
 
 
 # pylint: disable=duplicate-code
@@ -42,7 +43,7 @@ def get_info(part):
     """Get info about the FPGA part.
 
     :param part: the FPGA part as specified by the tool
-    :returns: a dictionary with the keys family, device, speed and package
+    :returns: a dict with the keys family, device, speed, package and prange
     """
     part = part.lower()
     # Looking for the family
@@ -51,6 +52,7 @@ def get_info(part):
         r'm2s': 'SmartFusion2',
         r'm2gl': 'Igloo2',
         r'rt4g': 'RTG4',
+        r'mpfs': 'PolarFireSoC',
         r'mpf': 'PolarFire',
         r'a2f': 'SmartFusion',
         r'afs': 'Fusion',
@@ -65,10 +67,11 @@ def get_info(part):
         if re.match(key, part):
             family = value
             break
-    # Looking for the device and package
+    # Looking for the device, speed and package
     device = None
     speed = None
     package = None
+    prange = None
     aux = part.split('-')
     if len(aux) == 2:
         device = aux[0]
@@ -86,7 +89,25 @@ def get_info(part):
         raise ValueError(
             'Part must be DEVICE-SPEED-PACKAGE or DEVICE-PACKAGE'
         )
+    # Looking for a part_range
+    pranges = {
+        'c': 'COM',
+        'e': 'EXT',
+        'i': 'IND',
+        'm': 'MIL',
+        't1': 'TGrade1'
+    }
+    prange = 'COM'
+    for suffix, name in pranges.items():
+        if package.endswith(suffix):
+            package = package[:-len(suffix)]
+            prange = name
+            break
     # Finish
     return {
-        'family': family, 'device': device, 'speed': speed, 'package': package
+        'family': family,
+        'device': device,
+        'speed': speed,
+        'package': package,
+        'prange': prange
     }

pyfpga/templates/libero.jinja

@@ -9,8 +9,8 @@
 {% if 'cfg' in steps %}# Project configuration -------------------------------------------------------
 
 if { [ file exists {{ project }} ] } { file delete -force -- {{ project }} }
-new_project -name {{ project }} -location {libero} -hdl {VERILOG} -family {SmartFusion2}
-set_device -family {{ family }} -die {{ device }} -package {{ package }} -speed {{ speed }}
+new_project -name {{ project }} -location libero -hdl VERILOG -family {{ family }}
+set_device -family {{ family }} -die {{ device }} -package {{ package}} -speed {{ speed }} -part_range {{ prange }}
 
 {% if hooks %}{{ hooks.precfg | join('\n') }}{% endif %}
 

tests/test_part.py

@@ -19,7 +19,8 @@ def test_libero():
         'family': 'SmartFusion2',
         'device': 'm2s010',
         'speed': '-1',
-        'package': 'tq144'
+        'package': 'tq144',
+        'prange': 'COM'
     }
     assert get_info_libero('m2s010-1-tq144') == info
     assert get_info_libero('m2s010-tq144-1') == info