From 109dbd1d622704f66453ccb244d1d47811d914d3 Mon Sep 17 00:00:00 2001
From: Franck Jullien <franck.jullien@gmail.com>
Date: Wed, 22 Sep 2021 09:53:22 +0200
Subject: [PATCH] efinity: small fixes

- do not include *.vh files in project,
- add self.options to class EfinityToolchain
- remove unconditional call to self.ifacewriter.add_ddr_xml
---
 litex/build/efinix/efinity.py     | 8 +++++---
 litex/build/efinix/ifacewriter.py | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/litex/build/efinix/efinity.py b/litex/build/efinix/efinity.py
index 71947b152..c473f031c 100644
--- a/litex/build/efinix/efinity.py
+++ b/litex/build/efinix/efinity.py
@@ -231,8 +231,9 @@ def _build_xml(partnumber, build_name, sources, additional_xml_commands):
     design_info = et.SubElement(root, 'efx:design_info')
     et.SubElement(design_info, "efx:top_module", name = build_name)
     for filename, language, library in sources:
-        val = {'name':filename, 'version':'default', 'library':'default'}
-        et.SubElement(design_info, "efx:design_file", val)
+        if '.vh' not in filename:
+            val = {'name':filename, 'version':'default', 'library':'default'}
+            et.SubElement(design_info, "efx:design_file", val)
     et.SubElement(design_info, "efx:top_vhdl_arch", name = "")
 
     constraint_info  = et.SubElement(root, "efx:constraint_info")
@@ -270,6 +271,7 @@ class EfinityToolchain():
     attr_translate = {}
 
     def __init__(self, efinity_path):
+        self.options     = {}
         self.clocks      = dict()
         self.false_paths = set()
         self.efinity_path = efinity_path
@@ -340,7 +342,7 @@ class EfinityToolchain():
 
         # DDR doesn't have Python API so we need to configure it
         # directly in the peri.xml file
-        self.ifacewriter.add_ddr_xml(build_name)
+        # self.ifacewriter.add_ddr_xml(build_name)
 
         # Run
         if run:
diff --git a/litex/build/efinix/ifacewriter.py b/litex/build/efinix/ifacewriter.py
index 6c2d7439d..9d709e25e 100644
--- a/litex/build/efinix/ifacewriter.py
+++ b/litex/build/efinix/ifacewriter.py
@@ -169,7 +169,7 @@ is_verbose = {1}
 design = DesignAPI(is_verbose)
 device = DeviceAPI(is_verbose)
 
-design.create('{2}', '{3}', './../build', overwrite=True)
+design.create('{2}', '{3}', './../gateware', overwrite=True)
 
 """
         return header.format(self.efinity_path, 'True', build_name, partnumber)