hdlmake: update top-level Manifest.py to not include any local variables

hdlmake does not allow by default local variables in included Manifest.py files. So, when this core is included in a bigger project (such as FMC-ADC), it should not have any local variables in its local Manifest.py file. Tested with SPEC and SVEC versions of FMC-ADC, works.

hdlmake: update top-level Manifest.py to not include any local variables
hdlmake does not allow by default local variables in included Manifest.py files. So, when this core is included in a bigger project (such as FMC-ADC), it should not have any local variables in its local Manifest.py file. Tested with SPEC and SVEC versions of FMC-ADC, works.
16e35730 · Dimitris Lampridis · 09f14bcf · 16e35730
Commit 16e35730 authored Feb 24, 2016 by Dimitris Lampridis
Hide whitespace changes
Inline Side-by-side

Showing with 33 additions and 24 deletions

Manifest.py hdl/rtl/Manifest.py +33 -24

No files found.
--- a/hdl/rtl/Manifest.py
+++ b/hdl/rtl/Manifest.py
@@ -4,42 +4,51 @@ files = ["ddr3_ctrl.vhd",
         "ddr3_ctrl_wrapper_pkg.vhd",
         "ddr3_ctrl_pkg.vhd"]

-local = []
+modules = {"local" : []}

 try:

-    for ctrl in ctrls:
+    # go through each one of the recognized memory controllers, adding them to the list of local
+    # modules and removing them from the top Manifest list of controllers

-        if ctrl == "bank3_32b_32b":
-            local.append("../spec/ip_cores/ddr3_ctrl_spec_bank3_32b_32b/user_design/rtl")
+    if "bank3_32b_32b" in ctrls:
+        modules["local"].append("../spec/ip_cores/ddr3_ctrl_spec_bank3_32b_32b/user_design/rtl")
+        ctrls.remove("bank3_32b_32b")

-        elif ctrl == "bank3_64b_32b":
-            local.append("../spec/ip_cores/ddr3_ctrl_spec_bank3_64b_32b/user_design/rtl")
+        if "bank3_64b_32b" in ctrls:
+        modules["local"].append("../spec/ip_cores/ddr3_ctrl_spec_bank3_64b_32b/user_design/rtl")
+        ctrls.remove("bank3_64b_32b")

-        elif ctrl == "bank4_32b_32b":
-            local.append("../svec/ip_cores/ddr3_ctrl_svec_bank4_32b_32b/user_design/rtl")
+    if "bank4_32b_32b" in ctrls:
+        modules["local"].append("../svec/ip_cores/ddr3_ctrl_svec_bank4_32b_32b/user_design/rtl")
+        ctrls.remove("bank4_32b_32b")

-        elif ctrl == "bank4_64b_32b":
-            local.append("../svec/ip_cores/ddr3_ctrl_svec_bank4_64b_32b/user_design/rtl")
+    if "bank4_64b_32b" in ctrls:
+        modules["local"].append("../svec/ip_cores/ddr3_ctrl_svec_bank4_64b_32b/user_design/rtl")
+        ctrls.remove("bank4_64b_32b")

-        elif ctrl == "bank5_32b_32b":
-            local.append("../svec/ip_cores/ddr3_ctrl_svec_bank5_32b_32b/user_design/rtl")
+    if "bank5_32b_32b" in ctrls:
+        modules["local"].append("../svec/ip_cores/ddr3_ctrl_svec_bank5_32b_32b/user_design/rtl")
+        ctrls.remove("bank5_32b_32b")

-        elif ctrl == "bank5_64b_32b":
-            local.append("../svec/ip_cores/ddr3_ctrl_svec_bank5_64b_32b/user_design/rtl")
+    if "bank5_64b_32b" in ctrls:
+        modules["local"].append("../svec/ip_cores/ddr3_ctrl_svec_bank5_64b_32b/user_design/rtl")
+        ctrls.remove("bank5_64b_32b")

-        elif ctrl == "bank1_32b_32b":
-            local.append("../vfc/ip_cores/ddr3_ctrl_vfc_bank1_32b_32b/user_design/rtl")
+    if "bank1_32b_32b" in ctrls:
+        modules["local"].append("../vfc/ip_cores/ddr3_ctrl_vfc_bank1_32b_32b/user_design/rtl")
+        ctrls.remove("bank1_32b_32b")

-        elif ctrl == "bank1_64b_32b":
-            local.append("../vfc/ip_cores/ddr3_ctrl_vfc_bank1_64b_32b/user_design/rtl")
+    if "bank1_64b_32b" in ctrls:
+        modules["local"].append("../vfc/ip_cores/ddr3_ctrl_vfc_bank1_64b_32b/user_design/rtl")
+        ctrls.remove("bank1_64b_32b")

-        else:
-            raise SystemExit("[ERROR]:DDR3: The controller type is not recognised! "
-                 "It must be one of: bank1_32b_32b, bank1_64b_32b, bank3_32b_32b, bank3_64b_32b, bank4_32b_32b, bank4_64b_32b, bank5_32b_32b, bank5_64b_32b.")
+    # at the end, check and complain if local list of modules is still empty, or if there are any
+    # unrecognized controllers left in the top Manifest list of controllers
+
+    if not modules["local"] or ctrls:
+        raise SystemExit("[ERROR]:DDR3: The controller type is not recognised! "
+                         "It must be one of: bank1_32b_32b, bank1_64b_32b, bank3_32b_32b, bank3_64b_32b, bank4_32b_32b, bank4_64b_32b, bank5_32b_32b, bank5_64b_32b.")

 except NameError:
    raise SystemExit("[ERROR]:DDR3: The variable ctrls MUST be defined in the top Manifest!")
-
-
-modules = {"local" : local}