Merge pull request FPGAwars#216 from FPGAwars/revert-215-develop-iCES…

…ugar Revert "iCESugar v1.5 support"
juanmard · Oct 21, 2020 · e0f375e · e0f375e
2 parents 3346c48 + fea84cd
commit e0f375e
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,6 @@ Apio is used by [Icestudio](https://github.com/FPGAwars/icestudio).
 | [scons](https://github.com/FPGAwars/tool-scons) | apio install scons | A software construction tool. [Scons project](http://scons.org)
 | [system](https://github.com/FPGAwars/tools-system) | apio install system | Tools for listing the USB devices and retrieving information from the FTDI chips
 | [verilator](https://github.com/FPGAwars/toolchain-verilator) | apio install verilator | Verilog HDL simulator. [Verilator project](https://www.veripool.org/wiki/verilator)
-| [icesprog](https://github.com/aalku/apio-toolchain-iCESugar) | apio install icesprog | iCESugar programmer. (for windows_x64 right now)
 
 **Supported platforms**
 
@@ -106,7 +105,6 @@ Apio is used by [Icestudio](https://github.com/FPGAwars/icestudio).
 | [UPDuino v2.0](http://gnarlygrey.atspace.cc/development-platform.html#upduino_v2) | FTDI |
 | [UPDuino v2.1](https://github.com/tinyvision-ai-inc/UPduino-v2.1) | FTDI |
 | [UPDuino v3.0](https://github.com/tinyvision-ai-inc/UPduino-v3.0) | FTDI |
-| [iCESugar v1.5](https://github.com/wuxx/icesugar/blob/master/README_en.md) (on windows_x64 right now) | FTDI |
 
 
 #### ECP5

diff --git a/apio/resources/boards.json b/apio/resources/boards.json
@@ -469,16 +469,5 @@
     "ftdi": {
       "desc": "Dual RS232-HS"
     }
-  },
-  "iCESugar_1_5": {
-    "name": "iCESugar v1.5",
-    "fpga": "iCE40-UP5K-SG48",
-    "programmer": {
-      "type": "icesprog"
-    },
-    "usb": {
-      "vid": "1d50",
-      "pid": "602b"
-    }
   }
 }
diff --git a/apio/resources/distribution.json b/apio/resources/distribution.json
@@ -10,8 +10,7 @@
     "scons": ">=3.0.1,<3.1.0",
     "system": ">=1.1.0,<1.2.0",
     "verilator": ">=1.0.0,<1.1.0",
-    "fujprog": ">=2020.10.6,<2021.1.0",
-    "icesprog": ">=1.0.0"
+    "fujprog": ">=2020.10.6,<2021.1.0"
   },
   "pip_packages": {
     "blackiceprog": ">=2.0.0,<3.0.0",

diff --git a/apio/resources/packages.json b/apio/resources/packages.json
@@ -158,23 +158,5 @@
       "extension": "tar.gz"
     },
     "description": "Programmer for ULX2/3S boards"
-  },
-  "icesprog" : {
-    "repository": {
-      "name": "apio-toolchain-iCESugar",
-      "organization": "aalku"
-    },
-    "release": {
-      "tag_name": "v%V",
-      "compressed_name": "icesprog-%P-%V",
-      "uncompressed_name": "",
-      "package_name": "icesprog",
-      "extension": "zip",
-      "available_platforms": [
-        "windows_amd64"
-      ]
-    },
-    "description": "iCESugar board programmer"
   }
-
 }
diff --git a/apio/resources/programmers.json b/apio/resources/programmers.json
@@ -52,9 +52,5 @@
   "dfu-util": {
     "command": "dfu-util",
     "args": "-d ${VID}:${PID} -D"
-  },
-  "icesprog": {
-    "command": "icesprog",
-    "args": ""
   }
 }
diff --git a/apio/util.py b/apio/util.py
@@ -285,8 +285,7 @@ def resolve_packages(packages, installed_packages, spec_packages):
         'iverilog': get_package_dir('toolchain-iverilog'),
         'verilator': get_package_dir('toolchain-verilator'),
         'gtkwave': get_package_dir('tool-gtkwave'),
-        'fujprog': get_package_dir('toolchain-fujprog'),
-        'icesprog': get_package_dir('icesprog')
+        'fujprog': get_package_dir('toolchain-fujprog')
     }
 
     bin_dir = {
@@ -298,8 +297,7 @@ def resolve_packages(packages, installed_packages, spec_packages):
         'iverilog': safe_join(base_dir.get('iverilog'), 'bin'),
         'verilator': safe_join(base_dir.get('verilator'), 'bin'),
         'gtkwave': safe_join(base_dir.get('gtkwave'), 'bin'),
-        'fujprog': safe_join(base_dir.get('fujprog'), 'bin'),
-        'icesprog': safe_join(base_dir.get('icesprog'), 'bin')
+        'fujprog': safe_join(base_dir.get('fujprog'), 'bin')
     }
 
     # -- Check packages
@@ -330,7 +328,6 @@ def resolve_packages(packages, installed_packages, spec_packages):
             bin_dir.get('iverilog'),
             bin_dir.get('verilator'),
             bin_dir.get('fujprog'),
-            bin_dir.get('icesprog'),
             os.environ['PATH']
         ])