merge small utils into one package

default/rules/default.py

@@ -19,8 +19,6 @@
         'prjtrellis',
         'prjoxide',
         'apicula',
-        'dfu-util',
-        'ecpprog',
         'openfpgaloader',
         'aiger',
         'avy',
@@ -36,12 +34,7 @@
         'gtkwave',
         'verilator',
         'iverilog',
-        'ecpdap',
-        'fujprog',
-        'iceprogduino',
         'python-programmers',
-        'openocd',
-        'icesprog',
         'utils',
         'pyhdl',
         'cocotb',

default/rules/programmers.py

@@ -1,87 +1,5 @@
 from src.base import SourceLocation, Target
 
-# dfu-util
-
-SourceLocation(
-	name = 'dfu-util',
-	vcs = 'git',
-	location = 'https://git.code.sf.net/p/dfu-util/dfu-util',
-	revision = 'origin/master',
-	license_file = 'COPYING',
-)
-
-Target(
-	name = 'dfu-util',
-	sources = [ 'dfu-util' ],
-	package = 'programmers',
-)
-
-# ecpdap
-
-SourceLocation(
-	name = 'ecpdap',
-	vcs = 'git',
-	location = 'https://github.com/adamgreig/ecpdap',
-	revision = 'origin/master',
-	license_file = 'LICENSE-MIT',
-)
-
-Target(
-	name = 'ecpdap',
-	sources = [ 'ecpdap' ],
-	package = 'programmers',
-)
-
-# ecpprog
-
-SourceLocation(
-	name = 'ecpprog',
-	vcs = 'git',
-	location = 'https://github.com/gregdavill/ecpprog',
-	revision = 'origin/main',
-	license_file = 'COPYING',
-)
-
-Target(
-	name = 'ecpprog',
-	sources = [ 'ecpprog' ],
-	package = 'programmers',
-)
-
-# fujprog
-
-SourceLocation(
-	name = 'fujprog',
-	vcs = 'git',
-	location = 'https://github.com/kost/fujprog',
-	revision = 'origin/master',
-	license_file = 'LICENSE',
-)
-
-Target(
-	name = 'fujprog',
-	sources = [ 'fujprog' ],
-	patches = [ 'Toolchain-mingw64.cmake' ],
-	package = 'programmers',
-)
-
-# iceprogduino
-
-SourceLocation(
-	name = 'iceprogduino',
-	vcs = 'git',
-	location = 'https://github.com/OLIMEX/iCE40HX1K-EVB',
-	revision = 'origin/master',
-	license_file = 'LICENSE',
-)
-
-Target(
-	name = 'iceprogduino',
-	sources = [ 'iceprogduino' ],
-	gitrev = [ ('iceprogduino', 'programmer'), ('iceprogduino', 'windows') ],
-	package = 'programmers',
-)
-
 # openfpgaloader
 
 SourceLocation(
@@ -147,36 +65,3 @@
 		'pyserial': ['pyserial-miniterm', 'pyserial-ports'],
 	},
 )
-
-# openocd
-
-SourceLocation(
-	name = 'openocd',
-	vcs = 'git',
-	location = 'https://repo.or.cz/openocd.git',
-	revision = 'origin/master',
-	license_file = 'COPYING',
-)
-
-Target(
-	name = 'openocd',
-	sources = [ 'openocd' ],
-	patches = [ 'openocd.diff' ],
-	package = 'programmers',
-)
-
-# icesprog
-
-SourceLocation(
-	name = 'icesprog',
-	vcs = 'git',
-	location = 'https://github.com/wuxx/icesugar',
-	revision = 'origin/master',
-	no_submodules = True,
-)
-
-Target(
-	name = 'icesprog',
-	sources = [ 'icesprog' ],
-	package = 'programmers',
-)

default/rules/utils.py

@@ -1,5 +1,6 @@
 from src.base import SourceLocation, Target
 
+# libusb
 SourceLocation(
 	name = 'libusb',
 	vcs = 'git',
@@ -8,6 +9,7 @@
 	license_file = 'COPYING',
 )
 
+# libftdi
 SourceLocation(
 	name = 'libftdi',
 	vcs = 'git',
@@ -16,9 +18,78 @@
 	license_file = 'LICENSE',
 )
 
+# dfu-util
+
+SourceLocation(
+	name = 'dfu-util',
+	vcs = 'git',
+	location = 'https://git.code.sf.net/p/dfu-util/dfu-util',
+	revision = 'origin/master',
+	license_file = 'COPYING',
+)
+
+# ecpdap
+
+SourceLocation(
+	name = 'ecpdap',
+	vcs = 'git',
+	location = 'https://github.com/adamgreig/ecpdap',
+	revision = 'origin/master',
+	license_file = 'LICENSE-MIT',
+)
+
+# ecpprog
+
+SourceLocation(
+	name = 'ecpprog',
+	vcs = 'git',
+	location = 'https://github.com/gregdavill/ecpprog',
+	revision = 'origin/main',
+	license_file = 'COPYING',
+)
+
+# fujprog
+
+SourceLocation(
+	name = 'fujprog',
+	vcs = 'git',
+	location = 'https://github.com/kost/fujprog',
+	revision = 'origin/master',
+	license_file = 'LICENSE',
+)
+
+# openocd
+
+SourceLocation(
+	name = 'openocd',
+	vcs = 'git',
+	location = 'https://repo.or.cz/openocd.git',
+	revision = 'origin/master',
+	license_file = 'COPYING',
+)
+
+# iceprogduino
+
+SourceLocation(
+	name = 'iceprogduino',
+	vcs = 'git',
+	location = 'https://github.com/OLIMEX/iCE40HX1K-EVB',
+	revision = 'origin/master',
+	license_file = 'LICENSE',
+)
+
+# icesprog
+
+SourceLocation(
+	name = 'icesprog',
+	vcs = 'git',
+	location = 'https://github.com/wuxx/icesugar',
+	revision = 'origin/master',
+	no_submodules = True,
+)
+
 Target(
 	name = 'utils',
-	sources = [ 'libusb', 'libftdi' ],
+	sources = [ 'libusb', 'libftdi', 'dfu-util', 'ecpdap', 'ecpprog', 'fujprog', 'openocd', 'iceprogduino', 'icesprog' ],
 	package = 'programmers',
-	tools = { 'libusb': ['libusb'], 'libftdi': ['libftdi'] },
 )