diff options
| -rw-r--r-- | config.mk | 3 | ||||
| -rw-r--r-- | docs/index.html | 18 | ||||
| -rw-r--r-- | icebox/Makefile | 95 | ||||
| -rwxr-xr-x | icebox/icebox_asc2hlc.py | 8 | ||||
| -rwxr-xr-x | icebox/icebox_chipdb.py | 6 | ||||
| -rwxr-xr-x | icebox/icebox_colbuf.py | 6 | ||||
| -rwxr-xr-x | icebox/icebox_diff.py | 6 | ||||
| -rwxr-xr-x | icebox/icebox_explain.py | 6 | ||||
| -rwxr-xr-x | icebox/icebox_hlc2asc.py | 8 | ||||
| -rwxr-xr-x | icebox/icebox_html.py | 2 | ||||
| -rwxr-xr-x | icebox/icebox_maps.py | 19 | ||||
| -rwxr-xr-x | icebox/icebox_stat.py | 6 | ||||
| -rwxr-xr-x | icebox/icebox_vlog.py | 6 | ||||
| -rw-r--r-- | icebram/Makefile | 14 | ||||
| -rw-r--r-- | icemulti/Makefile | 12 | ||||
| -rw-r--r-- | icemulti/icemulti.cc | 8 | ||||
| -rw-r--r-- | icepack/Makefile | 24 | ||||
| -rw-r--r-- | icepack/icepack.cc | 12 | ||||
| -rw-r--r-- | icepll/Makefile | 12 | ||||
| -rw-r--r-- | icepll/icepll.cc | 207 | ||||
| -rw-r--r-- | iceprog/Makefile | 12 | ||||
| -rw-r--r-- | iceprog/iceprog.c | 58 | ||||
| -rw-r--r-- | icetime/Makefile | 16 | ||||
| -rw-r--r-- | icetime/icetime.cc | 1 |
24 files changed, 374 insertions, 191 deletions
@@ -1,6 +1,7 @@ PREFIX ?= /usr/local DEBUG ?= 0 ICEPROG ?= 1 +PROGRAM_PREFIX ?= CXX ?= clang++ CC ?= clang @@ -22,7 +23,7 @@ CFLAGS += -MD -O$(OPT_LEVEL) $(DBG_LEVEL) -W$(WARN_LEVEL) -std=$(C_STD) -I$(PREF CXXFLAGS += -MD -O$(OPT_LEVEL) $(DBG_LEVEL) -W$(WARN_LEVEL) -std=$(CXX_STD) -I$(PREFIX)/include DESTDIR ?= -CHIPDB_SUBDIR ?= icebox +CHIPDB_SUBDIR ?= $(PROGRAM_PREFIX)icebox ifeq ($(MXE),1) EXE = .exe diff --git a/docs/index.html b/docs/index.html index 3ca1721..fc50ea8 100644 --- a/docs/index.html +++ b/docs/index.html @@ -30,7 +30,7 @@ <h2>What is Project IceStorm?</h2> <p> -Project IceStorm aims at reverse engineering and documenting the bitstream +Project IceStorm aims at documenting the bitstream format of Lattice iCE40 FPGAs and providing simple tools for analyzing and creating bitstream files. The IceStorm flow (<a href="http://www.clifford.at/yosys/">Yosys</a>, <a @@ -49,8 +49,8 @@ and UltraLite parts are not yet supported. <p> It has a very minimalistic architecture with a very regular structure. There are not many -different kinds of tiles or special function units. This makes it both ideal for -reverse engineering and as a reference platform for general purpose FPGA tool development. +different kinds of tiles or special function units. This makes it both ideal for creating +bitstream documentations and as a reference platform for general purpose FPGA tool development. </p> <p> @@ -64,8 +64,8 @@ Breakout Board</a> featuring an HX8K chip.) <h2>What is the Status of the Project?</h2> <p> -We are pretty confident that we have the 1K and 8K devices completely reverse -engineered. For example, it seems we can create correct functional Verilog +We are pretty confident that we have the 1K and 8K devices completely +documented. For example, it seems we can create correct functional Verilog models for all bitstreams generated by Lattice iCEcube2 for the iCE40 HX1K-TQ144 and the iCE40 HX8K-CT256 using our <tt>icebox_vlog</tt> tool. </p> @@ -557,12 +557,14 @@ Links to related projects. Contact me at clifford@clifford.at if you have an int <li><a href="http://hedmen.org/icestorm-doc/icestorm.html">IceStorm Learner’s Documentation</a> </ul> -<h3>Other FPGA reverse engineering projects</h3> +<h3>Other FPGA bitstream documentation projects</h3> <ul> -<li><a href="https://github.com/Wolfgang-Spraul/fpgatools">Xilinx xc6slx9 reverse engineering, Wolfgang Spraul</a> +<li><a href="https://github.com/SymbiFlow/prjtrellis">ECP5 bitstream documentation (Project Trellis)</a> +<li><a href="https://github.com/SymbiFlow/prjxray">Xilinx 7-series bitstream documentation (Project X-Ray)</a> +<li><a href="https://github.com/Wolfgang-Spraul/fpgatools">Xilinx xc6slx9 documentation, Wolfgang Spraul</a> <li><a href="http://www.fabienm.eu/flf/wp-content/uploads/2014/11/Note2008.pdf">From the bitstream to the netlist, Jean-Baptiste Note and Éric Rannaud</a> -<li><a href="http://git.bfuser.eu/?p=marex/typhoon.git;a=commit">Cyclone IV EP4CE6 reverse engineering, Marek Vasut</a> +<li><a href="http://git.bfuser.eu/?p=marex/typhoon.git;a=commit">Cyclone IV EP4CE6 documentation, Marek Vasut</a> </ul> <hr> diff --git a/icebox/Makefile b/icebox/Makefile index 6906681..2897dfb 100644 --- a/icebox/Makefile +++ b/icebox/Makefile @@ -36,45 +36,66 @@ clean: rm -f icebox.pyc iceboxdb.pyc install: all - mkdir -p $(DESTDIR)$(PREFIX)/share/icebox + mkdir -p $(DESTDIR)$(PREFIX)/share/$(PROGRAM_PREFIX)icebox mkdir -p $(DESTDIR)$(PREFIX)/bin - cp chipdb-384.txt $(DESTDIR)$(PREFIX)/share/icebox/ - cp chipdb-1k.txt $(DESTDIR)$(PREFIX)/share/icebox/ - cp chipdb-8k.txt $(DESTDIR)$(PREFIX)/share/icebox/ - cp chipdb-5k.txt $(DESTDIR)$(PREFIX)/share/icebox/ - cp chipdb-u4k.txt $(DESTDIR)$(PREFIX)/share/icebox/ - cp chipdb-lm4k.txt $(DESTDIR)$(PREFIX)/share/icebox/ - cp icebox.py $(DESTDIR)$(PREFIX)/bin/icebox.py - cp iceboxdb.py $(DESTDIR)$(PREFIX)/bin/iceboxdb.py - cp icebox_chipdb.py $(DESTDIR)$(PREFIX)/bin/icebox_chipdb$(PY_EXE) - cp icebox_diff.py $(DESTDIR)$(PREFIX)/bin/icebox_diff$(PY_EXE) - cp icebox_explain.py $(DESTDIR)$(PREFIX)/bin/icebox_explain$(PY_EXE) - cp icebox_asc2hlc.py $(DESTDIR)$(PREFIX)/bin/icebox_asc2hlc$(PY_EXE) - cp icebox_hlc2asc.py $(DESTDIR)$(PREFIX)/bin/icebox_hlc2asc$(PY_EXE) - cp icebox_colbuf.py $(DESTDIR)$(PREFIX)/bin/icebox_colbuf$(PY_EXE) - cp icebox_html.py $(DESTDIR)$(PREFIX)/bin/icebox_html$(PY_EXE) - cp icebox_maps.py $(DESTDIR)$(PREFIX)/bin/icebox_maps$(PY_EXE) - cp icebox_vlog.py $(DESTDIR)$(PREFIX)/bin/icebox_vlog$(PY_EXE) - cp icebox_stat.py $(DESTDIR)$(PREFIX)/bin/icebox_stat$(PY_EXE) + cp chipdb-384.txt $(DESTDIR)$(PREFIX)/share/$(PROGRAM_PREFIX)icebox/ + cp chipdb-1k.txt $(DESTDIR)$(PREFIX)/share/$(PROGRAM_PREFIX)icebox/ + cp chipdb-8k.txt $(DESTDIR)$(PREFIX)/share/$(PROGRAM_PREFIX)icebox/ + cp chipdb-5k.txt $(DESTDIR)$(PREFIX)/share/$(PROGRAM_PREFIX)icebox/ + cp chipdb-u4k.txt $(DESTDIR)$(PREFIX)/share/$(PROGRAM_PREFIX)icebox/ + cp chipdb-lm4k.txt $(DESTDIR)$(PREFIX)/share/$(PROGRAM_PREFIX)icebox/ + cp icebox.py $(DESTDIR)$(PREFIX)/bin/$(subst -,_,$(PROGRAM_PREFIX))icebox.py + cp iceboxdb.py $(DESTDIR)$(PREFIX)/bin/$(subst -,_,$(PROGRAM_PREFIX))iceboxdb.py + cp icebox_chipdb.py $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_chipdb$(PY_EXE) + cp icebox_diff.py $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_diff$(PY_EXE) + cp icebox_explain.py $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_explain$(PY_EXE) + cp icebox_asc2hlc.py $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_asc2hlc$(PY_EXE) + cp icebox_hlc2asc.py $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_hlc2asc$(PY_EXE) + cp icebox_colbuf.py $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_colbuf$(PY_EXE) + cp icebox_html.py $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_html$(PY_EXE) + cp icebox_maps.py $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_maps$(PY_EXE) + cp icebox_vlog.py $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_vlog$(PY_EXE) + cp icebox_stat.py $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_stat$(PY_EXE) + sed -i 's+import iceboxdb+import $(subst -,_,$(PROGRAM_PREFIX))iceboxdb as iceboxdb+g' $(DESTDIR)$(PREFIX)/bin/$(subst -,_,$(PROGRAM_PREFIX))icebox.py + sed -i 's+import icebox+import $(subst -,_,$(PROGRAM_PREFIX))icebox as icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_chipdb$(PY_EXE) + sed -i 's+import icebox+import $(subst -,_,$(PROGRAM_PREFIX))icebox as icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_diff$(PY_EXE) + sed -i 's+from icebox+from $(subst -,_,$(PROGRAM_PREFIX))icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_diff$(PY_EXE) + sed -i 's+import icebox+import $(subst -,_,$(PROGRAM_PREFIX))icebox as icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_explain$(PY_EXE) + sed -i 's+from icebox+from $(subst -,_,$(PROGRAM_PREFIX))icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_explain$(PY_EXE) + sed -i 's+import icebox+import $(subst -,_,$(PROGRAM_PREFIX))icebox as icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_asc2hlc$(PY_EXE) + sed -i 's+from icebox+from $(subst -,_,$(PROGRAM_PREFIX))icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_asc2hlc$(PY_EXE) + sed -i 's+import icebox+import $(subst -,_,$(PROGRAM_PREFIX))icebox as icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_hlc2asc$(PY_EXE) + sed -i 's+from icebox+from $(subst -,_,$(PROGRAM_PREFIX))icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_hlc2asc$(PY_EXE) + sed -i 's+import icebox+import $(subst -,_,$(PROGRAM_PREFIX))icebox as icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_colbuf$(PY_EXE) + sed -i 's+from icebox+from $(subst -,_,$(PROGRAM_PREFIX))icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_colbuf$(PY_EXE) + sed -i 's+import icebox+import $(subst -,_,$(PROGRAM_PREFIX))icebox as icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_html$(PY_EXE) + sed -i 's+from icebox+from $(subst -,_,$(PROGRAM_PREFIX))icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_html$(PY_EXE) + sed -i 's+import icebox+import $(subst -,_,$(PROGRAM_PREFIX))icebox as icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_maps$(PY_EXE) + sed -i 's+from icebox+from $(subst -,_,$(PROGRAM_PREFIX))icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_maps$(PY_EXE) + sed -i 's+import icebox+import $(subst -,_,$(PROGRAM_PREFIX))icebox as icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_vlog$(PY_EXE) + sed -i 's+from icebox+from $(subst -,_,$(PROGRAM_PREFIX))icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_vlog$(PY_EXE) + sed -i 's+/usr/local/share/icebox+$(PREFIX)/share/$(PROGRAM_PREFIX)icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_vlog$(PY_EXE) + sed -i 's+import icebox+import $(subst -,_,$(PROGRAM_PREFIX))icebox as icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_stat$(PY_EXE) + sed -i 's+from icebox+from $(subst -,_,$(PROGRAM_PREFIX))icebox+g' $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_stat$(PY_EXE) uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/icebox.py - rm -f $(DESTDIR)$(PREFIX)/bin/iceboxdb.py - rm -f $(DESTDIR)$(PREFIX)/bin/icebox_chipdb$(PY_EXE) - rm -f $(DESTDIR)$(PREFIX)/bin/icebox_diff$(PY_EXE) - rm -f $(DESTDIR)$(PREFIX)/bin/icebox_explain$(PY_EXE) - rm -f $(DESTDIR)$(PREFIX)/bin/icebox_asc2hlc$(PY_EXE) - rm -f $(DESTDIR)$(PREFIX)/bin/icebox_hlc2asc$(PY_EXE) - rm -f $(DESTDIR)$(PREFIX)/bin/icebox_colbuf$(PY_EXE) - rm -f $(DESTDIR)$(PREFIX)/bin/icebox_html$(PY_EXE) - rm -f $(DESTDIR)$(PREFIX)/bin/icebox_maps$(PY_EXE) - rm -f $(DESTDIR)$(PREFIX)/bin/icebox_vlog$(PY_EXE) - rm -f $(DESTDIR)$(PREFIX)/bin/icebox_stat$(PY_EXE) - rm -f $(DESTDIR)$(PREFIX)/share/icebox/chipdb-384.txt - rm -f $(DESTDIR)$(PREFIX)/share/icebox/chipdb-1k.txt - rm -f $(DESTDIR)$(PREFIX)/share/icebox/chipdb-8k.txt - rm -f $(DESTDIR)$(PREFIX)/share/icebox/chipdb-lm4k.txt - rm -f $(DESTDIR)$(PREFIX)/share/icebox/chipdb-u4k.txt - -rmdir $(DESTDIR)$(PREFIX)/share/icebox + rm -f $(DESTDIR)$(PREFIX)/bin/$(subst -,_,$(PROGRAM_PREFIX))cebox.py + rm -f $(DESTDIR)$(PREFIX)/bin/$(subst -,_,$(PROGRAM_PREFIX))iceboxdb.py + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_chipdb$(PY_EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_diff$(PY_EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_explain$(PY_EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_asc2hlc$(PY_EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_hlc2asc$(PY_EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_colbuf$(PY_EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_html$(PY_EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_maps$(PY_EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_vlog$(PY_EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebox_stat$(PY_EXE) + rm -f $(DESTDIR)$(PREFIX)/share/$(PROGRAM_PREFIX)icebox/chipdb-384.txt + rm -f $(DESTDIR)$(PREFIX)/share/$(PROGRAM_PREFIX)icebox/chipdb-1k.txt + rm -f $(DESTDIR)$(PREFIX)/share/$(PROGRAM_PREFIX)icebox/chipdb-8k.txt + rm -f $(DESTDIR)$(PREFIX)/share/$(PROGRAM_PREFIX)icebox/chipdb-lm4k.txt + rm -f $(DESTDIR)$(PREFIX)/share/$(PROGRAM_PREFIX)icebox/chipdb-u4k.txt + -rmdir $(DESTDIR)$(PREFIX)/share/$(PROGRAM_PREFIX)icebox .PHONY: all check clean install uninstall diff --git a/icebox/icebox_asc2hlc.py b/icebox/icebox_asc2hlc.py index 003106f..8e64997 100755 --- a/icebox/icebox_asc2hlc.py +++ b/icebox/icebox_asc2hlc.py @@ -1068,7 +1068,7 @@ def main(): except getopt.GetoptError as e: sys.stderr.write("%s: %s\n" % (program_short_name, e.msg)) sys.stderr.write("Try `%s --help' for more information.\n" - % sys.argv[0]) + % program_short_name) sys.exit(1) for opt, arg in opts: @@ -1085,7 +1085,7 @@ Usage: %s [OPTION]... FILE If you have a bug report, please file an issue on github: https://github.com/rlutz/icestorm/issues -""" % sys.argv[0]) +""" % program_short_name) sys.exit(0) if opt == '--version': @@ -1113,13 +1113,13 @@ GNU General Public License for more details. if not args: sys.stderr.write("%s: missing argument\n" % (program_short_name)) sys.stderr.write("Try `%s --help' for more information.\n" - % sys.argv[0]) + % program_short_name) sys.exit(1) if len(args) != 1: sys.stderr.write("%s: too many arguments\n" % (program_short_name)) sys.stderr.write("Try `%s --help' for more information.\n" - % sys.argv[0]) + % program_short_name) sys.exit(1) ic = icebox.iceconfig() diff --git a/icebox/icebox_chipdb.py b/icebox/icebox_chipdb.py index 9c8d6df..722ec37 100755 --- a/icebox/icebox_chipdb.py +++ b/icebox/icebox_chipdb.py @@ -16,7 +16,7 @@ # import icebox -import getopt, sys, re +import getopt, sys, re, os mode_384 = False mode_lm4k = False @@ -26,7 +26,7 @@ mode_8k = False def usage(): print(""" -Usage: icebox_chipdb [options] [bitmap.asc] +Usage: %s [options] [bitmap.asc] -3 create chipdb for 384 device @@ -42,7 +42,7 @@ Usage: icebox_chipdb [options] [bitmap.asc] -u create chipdb for u4k device -""") +""" % os.path.basename(sys.argv[0])) sys.exit(0) try: diff --git a/icebox/icebox_colbuf.py b/icebox/icebox_colbuf.py index ec6843e..3003a90 100755 --- a/icebox/icebox_colbuf.py +++ b/icebox/icebox_colbuf.py @@ -17,21 +17,21 @@ import icebox from icebox import re_match_cached -import getopt, sys, re +import getopt, sys, re, os check_mode = False fixup_mode = False def usage(): print(""" -Usage: icebox_colbuf [options] [input.asc [output.asc]] +Usage: %s [options] [input.asc [output.asc]] -c check colbuf bits -f fix colbuf bits -""") +""" % os.path.basename(sys.argv[0])) sys.exit(1) try: diff --git a/icebox/icebox_diff.py b/icebox/icebox_diff.py index 5252fc4..f433bcf 100755 --- a/icebox/icebox_diff.py +++ b/icebox/icebox_diff.py @@ -17,13 +17,13 @@ import icebox from icebox import re_match_cached -import sys +import sys, os import re if len(sys.argv) != 3: print(""" -Usage: icebox_diff bitmap1.asc bitmap2.asc -""") +Usage: %s bitmap1.asc bitmap2.asc +""" % os.path.basename(sys.argv[0])) sys.exit(0) print("Reading file '%s'.." % sys.argv[1]) diff --git a/icebox/icebox_explain.py b/icebox/icebox_explain.py index f843c09..25061ab 100755 --- a/icebox/icebox_explain.py +++ b/icebox/icebox_explain.py @@ -17,7 +17,7 @@ import icebox from icebox import re_match_cached, re_search_cached -import getopt, sys, re +import getopt, sys, re, os print_bits = False print_map = False @@ -26,7 +26,7 @@ print_all = False def usage(): print(""" -Usage: icebox_explain [options] [bitmap.asc] +Usage: %s [options] [bitmap.asc] -b print config bit names for each config statement @@ -39,7 +39,7 @@ Usage: icebox_explain [options] [bitmap.asc] -t '<x-coordinate> <y-coordinate>' print only the specified tile -""") +""" % os.path.basename(sys.argv[0])) sys.exit(0) try: diff --git a/icebox/icebox_hlc2asc.py b/icebox/icebox_hlc2asc.py index a95f610..59d2f69 100755 --- a/icebox/icebox_hlc2asc.py +++ b/icebox/icebox_hlc2asc.py @@ -1147,7 +1147,7 @@ def main(): except getopt.GetoptError as e: sys.stderr.write("%s: %s\n" % (program_short_name, e.msg)) sys.stderr.write("Try `%s --help' for more information.\n" - % sys.argv[0]) + % program_short_name) sys.exit(1) for opt, arg in opts: @@ -1161,7 +1161,7 @@ Usage: %s [OPTION]... FILE If you have a bug report, please file an issue on github: https://github.com/rlutz/icestorm/issues -""" % sys.argv[0]) +""" % program_short_name) sys.exit(0) if opt == '--version': @@ -1184,13 +1184,13 @@ GNU General Public License for more details. if not args: sys.stderr.write("%s: missing argument\n" % (program_short_name)) sys.stderr.write("Try `%s --help' for more information.\n" - % sys.argv[0]) + % program_short_name) sys.exit(1) if len(args) != 1: sys.stderr.write("%s: too many arguments\n" % (program_short_name)) sys.stderr.write("Try `%s --help' for more information.\n" - % sys.argv[0]) + % program_short_name) sys.exit(1) if args[0] == '-': diff --git a/icebox/icebox_html.py b/icebox/icebox_html.py index b710f61..3785a45 100755 --- a/icebox/icebox_html.py +++ b/icebox/icebox_html.py @@ -27,7 +27,7 @@ mode384 = False tx, ty = 0, 0 def usage(): - print("Usage: %s [options]" % sys.argv[0]) + print("Usage: %s [options]" % os.path.basename(sys.argv[0])) print(" -x tile_x_coordinate") print(" -y tile_y_coordinate") print(" -d outdir") diff --git a/icebox/icebox_maps.py b/icebox/icebox_maps.py index 35ff316..062335d 100755 --- a/icebox/icebox_maps.py +++ b/icebox/icebox_maps.py @@ -17,20 +17,21 @@ import icebox from icebox import re_match_cached -import getopt, sys, re +import getopt, sys, re, os mode = None def usage(): + program_short_name = os.path.basename(sys.argv[0]) print("Usage:") - print(" icebox_maps -m bitmaps") - print(" icebox_maps -m io_tile_nets_l") - print(" icebox_maps -m io_tile_nets_r") - print(" icebox_maps -m io_tile_nets_t") - print(" icebox_maps -m io_tile_nets_b") - print(" icebox_maps -m logic_tile_nets") - print(" icebox_maps -m ramb_tile_nets") - print(" icebox_maps -m ramt_tile_nets") + print(" %s -m bitmaps" % program_short_name) + print(" %s -m io_tile_nets_l" % program_short_name) + print(" %s -m io_tile_nets_r" % program_short_name) + print(" %s -m io_tile_nets_t" % program_short_name) + print(" %s -m io_tile_nets_b" % program_short_name) + print(" %s -m logic_tile_nets" % program_short_name) + print(" %s -m ramb_tile_nets" % program_short_name) + print(" %s -m ramt_tile_nets" % program_short_name) sys.exit(0) try: diff --git a/icebox/icebox_stat.py b/icebox/icebox_stat.py index ec404fb..5752267 100755 --- a/icebox/icebox_stat.py +++ b/icebox/icebox_stat.py @@ -17,18 +17,18 @@ import icebox from icebox import re_match_cached -import getopt, sys, re +import getopt, sys, re, os verbose = False def usage(): print(""" -Usage: icebox_stat [options] [bitmap.asc] +Usage: %s [options] [bitmap.asc] -v verbose output -""") +""" % os.path.basename(sys.argv[0])) sys.exit(0) try: diff --git a/icebox/icebox_vlog.py b/icebox/icebox_vlog.py index a2c7950..0133347 100755 --- a/icebox/icebox_vlog.py +++ b/icebox/icebox_vlog.py @@ -17,7 +17,7 @@ import icebox from icebox import re_match_cached, re_sub_cached, re_search_cached -import getopt, sys, re +import getopt, sys, re, os strip_comments = False strip_interconn = False @@ -34,7 +34,7 @@ modname = "chip" def usage(): print(""" -Usage: icebox_vlog [options] [bitmap.asc] +Usage: %s [options] [bitmap.asc] -s strip comments from output @@ -70,7 +70,7 @@ Usage: icebox_vlog [options] [bitmap.asc] -D enable exactly-one-driver checks -""") +""" % os.path.basename(sys.argv[0])) sys.exit(0) try: diff --git a/icebram/Makefile b/icebram/Makefile index 34801da..219be59 100644 --- a/icebram/Makefile +++ b/icebram/Makefile @@ -4,24 +4,24 @@ ifeq ($(STATIC),1) LDFLAGS += -static endif -all: icebram$(EXE) +all: $(PROGRAM_PREFIX)icebram$(EXE) -icebram$(EXE): icebram.o +$(PROGRAM_PREFIX)icebram$(EXE): icebram.o $(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS) -test: icebram +test: $(PROGRAM_PREFIX)icebram bash rundemo.sh install: all mkdir -p $(DESTDIR)$(PREFIX)/bin - cp icebram$(EXE) $(DESTDIR)$(PREFIX)/bin/icebram$(EXE) + cp $(PROGRAM_PREFIX)icebram$(EXE) $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebram$(EXE) uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/icebram$(EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icebram$(EXE) clean: - rm -f icebram$(EXE) - rm -f icebram.exe + rm -f $(PROGRAM_PREFIX)icebram$(EXE) + rm -f $(PROGRAM_PREFIX)icebram.exe rm -f demo.* demo_*.* rm -f *.o *.d diff --git a/icemulti/Makefile b/icemulti/Makefile index 7e2fe1c..1719f39 100644 --- a/icemulti/Makefile +++ b/icemulti/Makefile @@ -4,21 +4,21 @@ ifeq ($(STATIC),1) LDFLAGS += -static endif -all: icemulti$(EXE) +all: $(PROGRAM_PREFIX)icemulti$(EXE) -icemulti$(EXE): icemulti.o +$(PROGRAM_PREFIX)icemulti$(EXE): icemulti.o $(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS) install: all mkdir -p $(DESTDIR)$(PREFIX)/bin - cp icemulti$(EXE) $(DESTDIR)$(PREFIX)/bin/icemulti$(EXE) + cp $(PROGRAM_PREFIX)icemulti$(EXE) $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icemulti$(EXE) uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/icemulti$(EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icemulti$(EXE) clean: - rm -f icemulti$(EXE) - rm -f icemulti.exe + rm -f $(PROGRAM_PREFIX)icemulti$(EXE) + rm -f $(PROGRAM_PREFIX)icemulti.exe rm -f *.o *.d -include *.d diff --git a/icemulti/icemulti.cc b/icemulti/icemulti.cc index 4bc0919..52a7800 100644 --- a/icemulti/icemulti.cc +++ b/icemulti/icemulti.cc @@ -157,10 +157,10 @@ static void write_header(std::ostream &ofs, uint32_t &file_offset, write_byte(ofs, file_offset, 0x00); } -void usage() +void usage(const char *cmd) { log("\n"); - log("Usage: icemulti [options] input-files\n"); + log("Usage: %s [options] input-files\n", cmd); log("\n"); log(" -c\n"); log(" coldboot mode, power on reset image is selected by CBSEL0/CBSEL1\n"); @@ -252,12 +252,12 @@ int main(int argc, char **argv) print_offsets = true; break; default: - usage(); + usage(argv[0]); } if (optind == argc) { fprintf(stderr, "%s: missing argument\n", program_short_name); - usage(); + usage(argv[0]); } while (optind != argc) { diff --git a/icepack/Makefile b/icepack/Makefile index 3e8c774..46f2410 100644 --- a/icepack/Makefile +++ b/icepack/Makefile @@ -5,30 +5,30 @@ ifeq ($(STATIC),1) LDFLAGS += -static endif -all: icepack$(EXE) iceunpack$(EXE) +all: $(PROGRAM_PREFIX)icepack$(EXE) $(PROGRAM_PREFIX)iceunpack$(EXE) -icepack$(EXE): icepack.o +$(PROGRAM_PREFIX)icepack$(EXE): icepack.o $(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS) -iceunpack$(EXE): icepack$(EXE) - ln -sf icepack$(EXE) iceunpack$(EXE) +$(PROGRAM_PREFIX)iceunpack$(EXE): $(PROGRAM_PREFIX)icepack$(EXE) + ln -sf $(PROGRAM_PREFIX)icepack$(EXE) $(PROGRAM_PREFIX)iceunpack$(EXE) -iceunpack.exe: +$(PROGRAM_PREFIX)iceunpack.exe: # no iceunpack.exe, use icepack -u install: all mkdir -p $(DESTDIR)$(PREFIX)/bin - cp icepack$(EXE) $(DESTDIR)$(PREFIX)/bin/icepack$(EXE) - ln -sf icepack$(EXE) $(DESTDIR)$(PREFIX)/bin/iceunpack$(EXE) + cp $(PROGRAM_PREFIX)icepack$(EXE) $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icepack$(EXE) + ln -sf $(PROGRAM_PREFIX)icepack$(EXE) $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)iceunpack$(EXE) uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/icepack$(EXE) - rm -f $(DESTDIR)$(PREFIX)/bin/iceunpack$(EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icepack$(EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)iceunpack$(EXE) clean: - rm -f icepack$(EXE) - rm -f iceunpack$(EXE) - rm -f icepack.exe + rm -f $(PROGRAM_PREFIX)icepack$(EXE) + rm -f $(PROGRAM_PREFIX)iceunpack$(EXE) + rm -f $(PROGRAM_PREFIX)icepack.exe rm -f *.o *.d -include *.d diff --git a/icepack/icepack.cc b/icepack/icepack.cc index 9b38ab5..490bbbf 100644 --- a/icepack/icepack.cc +++ b/icepack/icepack.cc @@ -968,7 +968,17 @@ void FpgaConfig::write_cram_pbm(std::ostream &ofs, int bank_num) const ofs << "P3\n"; ofs << stringf("%d %d\n", 2*this->cram_width, 2*this->cram_height); ofs << "255\n"; - uint32_t tile_type[4][this->cram_width][this->cram_height]; + + vector<vector<uint32_t>> tile_type[4]; + + // We require random access to tile_type, so ensure that each column of each + // bank is initialised so that all possible indices are valid + for (int bank = 0; bank < 4; bank++) { + tile_type[bank].resize(this->cram_width); + for (int x = 0; x < this->cram_width; x++) + tile_type[bank][x].resize(this->cram_height); + } + for (int y = 0; y <= this->chip_height()+1; y++) for (int x = 0; x <= this->chip_width()+1; x++) { diff --git a/icepll/Makefile b/icepll/Makefile index 13a1d81..6e9467b 100644 --- a/icepll/Makefile +++ b/icepll/Makefile @@ -4,21 +4,21 @@ ifeq ($(STATIC),1) LDFLAGS += -static endif -all: icepll$(EXE) +all: $(PROGRAM_PREFIX)icepll$(EXE) -icepll$(EXE): icepll.o +$(PROGRAM_PREFIX)icepll$(EXE): icepll.o $(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS) install: all mkdir -p $(DESTDIR)$(PREFIX)/bin - cp icepll$(EXE) $(DESTDIR)$(PREFIX)/bin/icepll$(EXE) + cp $(PROGRAM_PREFIX)icepll$(EXE) $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icepll$(EXE) uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/icepll$(EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icepll$(EXE) clean: - rm -f icepll$(EXE) - rm -f icepll.exe + rm -f $(PROGRAM_PREFIX)icepll$(EXE) + rm -f $(PROGRAM_PREFIX)icepll.exe rm -f *.o *.d -include *.d diff --git a/icepll/icepll.cc b/icepll/icepll.cc index f9ebecf..a2db72f 100644 --- a/icepll/icepll.cc +++ b/icepll/icepll.cc @@ -51,6 +51,14 @@ void help(const char *cmd) printf(" -S\n"); printf(" Disable SIMPLE feedback path mode\n"); printf("\n"); + printf(" -b\n"); + printf(" Find best input frequency for desired PLL Output frequency\n"); + printf(" using the normally stocked oscillators at Mouser\n"); + printf("\n"); + printf(" -B <filename>\n"); + printf(" Find best input frequency for desired PLL Output frequency\n"); + printf(" using frequencies read from <filename>\n"); + printf("\n"); printf(" -f <filename>\n"); printf(" Save PLL configuration as Verilog to file\n"); printf(" If <filename> is - then the Verilog is written to stdout.\n"); @@ -67,6 +75,119 @@ void help(const char *cmd) exit(1); } +bool analyze( + bool simple_feedback, double f_pllin, double f_pllout, + double *best_fout, int *best_divr, int *best_divf, int *best_divq + ) +{ + bool found_something = false; + *best_fout = 0; + *best_divr = 0; + *best_divf = 0; + *best_divq = 0; + + int divf_max = simple_feedback ? 127 : 63; + // The documentation in the iCE40 PLL Usage Guide incorrectly lists the + // maximum value of DIVF as 63, when it is only limited to 63 when using + // feedback modes other that SIMPLE. + + if (f_pllin < 10 || f_pllin > 133) { + fprintf(stderr, "Error: PLL input frequency %.3f MHz is outside range 10 MHz - 133 MHz!\n", f_pllin); + exit(1); + } + + if (f_pllout < 16 || f_pllout > 275) { + fprintf(stderr, "Error: PLL output frequency %.3f MHz is outside range 16 MHz - 275 MHz!\n", f_pllout); + exit(1); + } + + for (int divr = 0; divr <= 15; divr++) + { + double f_pfd = f_pllin / (divr + 1); + if (f_pfd < 10 || f_pfd > 133) continue; + + for (int divf = 0; divf <= divf_max; divf++) + { + if (simple_feedback) + { + double f_vco = f_pfd * (divf + 1); + if (f_vco < 533 || f_vco > 1066) continue; + + for (int divq = 1; divq <= 6; divq++) + { + double fout = f_vco * exp2(-divq); + + if (fabs(fout - f_pllout) < fabs(*best_fout - f_pllout) || !found_something) { + *best_fout = fout; + *best_divr = divr; + *best_divf = divf; + *best_divq = divq; + found_something = true; + } + } + } + else + { + for (int divq = 1; divq <= 6; divq++) + { + double f_vco = f_pfd * (divf + 1) * exp2(divq); + if (f_vco < 533 || f_vco > 1066) continue; + + double fout = f_vco * exp2(-divq); + + if (fabs(fout - f_pllout) < fabs(*best_fout - f_pllout) || !found_something) { + *best_fout = fout; + *best_divr = divr; + *best_divf = divf; + *best_divq = divq; + found_something = true; + } + } + } + } + } + + return found_something; +} + + // Table of frequencies to test in "best" mode defaults to ABRACOM Crystal + // oscillators "Normally stocked" at Mouser + double freq_table[100] = + { + 10, 11.0592, 11.2896, 11.7846, 12, 12.288, 12.352, 12.5, 13, 13.5, 13.6, 14.31818, 14.7456, 15, 16, 16.384, 17.2032, 18.432, 19.2, 19.44, 19.6608, + 20, 24, 24.576, 25, 26, 27, 27.12, 28.63636, 28.9, 29.4912, + 30, 32, 32.768, 33, 33.206, 33.333, 35.328, 36, 37.03, 37.4, 38.4, 38.88, + 40, 40.95, 40.97, 44, 44.736, 48, + 50, 54, 57.692, + 60, 64, 65, 66, 66.666, 68, + 70, 72, 75, 76.8, + 80, 80.92, + 92.16, 96, 98.304, + 100, 104, 106.25, 108, + 114.285, + 120, 122.88, 125, + 0 + }; + +void readfreqfile(const char *filename) { + FILE *f; + f = fopen(filename, "r"); + if (f == NULL) { + fprintf(stderr, "Error: Can't open file %s!\n",filename); + exit(1); + } + + // Clear and overwrite the default values in the table + memset(freq_table, 0, sizeof(freq_table)); + int i = 0; + double freq=0; + while((i < sizeof(freq_table)/sizeof(double)) && (fscanf(f, "%lf", &freq) > 0)) + { + freq_table[i++] = freq; + } + fclose(f); +} + int main(int argc, char **argv) { #ifdef __EMSCRIPTEN__ @@ -88,10 +209,12 @@ int main(int argc, char **argv) bool file_stdout = false; const char* module_name = NULL; bool save_as_module = false; + bool best_mode = false; + const char* freqfile = NULL; bool quiet = false; int opt; - while ((opt = getopt(argc, argv, "i:o:Smf:n:q")) != -1) + while ((opt = getopt(argc, argv, "i:o:Smf:n:bB:q")) != -1) { switch (opt) { @@ -113,6 +236,13 @@ int main(int argc, char **argv) case 'n': module_name = optarg; break; + case 'b': + best_mode = true; + break; + case 'B': + best_mode = true; + freqfile = optarg; + break; case 'q': quiet = true; break; @@ -137,68 +267,37 @@ int main(int argc, char **argv) quiet = true; } + if (freqfile) { + readfreqfile(freqfile); + } + bool found_something = false; double best_fout = 0; int best_divr = 0; int best_divf = 0; int best_divq = 0; - // The documentation in the iCE40 PLL Usage Guide incorrectly lists the - // maximum value of DIVF as 63, when it is only limited to 63 when using - // feedback modes other that SIMPLE. - int divf_max = simple_feedback ? 127 : 63; - - if (f_pllin < 10 || f_pllin > 133) { - fprintf(stderr, "Error: PLL input frequency %.3f MHz is outside range 10 MHz - 133 MHz!\n", f_pllin); - exit(1); - } - - if (f_pllout < 16 || f_pllout > 275) { - fprintf(stderr, "Error: PLL output frequency %.3f MHz is outside range 16 MHz - 275 MHz!\n", f_pllout); - exit(1); - } - - for (int divr = 0; divr <= 15; divr++) - { - double f_pfd = f_pllin / (divr + 1); - if (f_pfd < 10 || f_pfd > 133) continue; - - for (int divf = 0; divf <= divf_max; divf++) + if (!best_mode) { + // Use only specified input frequency + found_something = analyze(simple_feedback, f_pllin, f_pllout, &best_fout, &best_divr, &best_divf, &best_divq); + } else { + // Iterate over all standard crystal frequencies and select the best + for (int i = 0; freq_table[i]>0.0 ; i++) { - if (simple_feedback) - { - double f_vco = f_pfd * (divf + 1); - if (f_vco < 533 || f_vco > 1066) continue; - - for (int divq = 1; divq <= 6; divq++) - { - double fout = f_vco * exp2(-divq); - - if (fabs(fout - f_pllout) < fabs(best_fout - f_pllout) || !found_something) { - best_fout = fout; - best_divr = divr; - best_divf = divf; - best_divq = divq; - found_something = true; - } - } - } - else + double fout = 0; + int divr = 0; + int divf = 0; + int divq = 0; + if (analyze(simple_feedback, freq_table[i], f_pllout, &fout, &divr, &divf, &divq)) { - for (int divq = 1; divq <= 6; divq++) + found_something = true; + if (abs(fout - f_pllout) < abs(best_fout - f_pllout)) { - double f_vco = f_pfd * (divf + 1) * exp2(divq); - if (f_vco < 533 || f_vco > 1066) continue; - - double fout = f_vco * exp2(-divq); - - if (fabs(fout - f_pllout) < fabs(best_fout - f_pllout) || !found_something) { - best_fout = fout; - best_divr = divr; - best_divf = divf; - best_divq = divq; - found_something = true; - } + f_pllin = freq_table[i]; + best_fout = fout; + best_divr = divr; + best_divf = divf; + best_divq = divq; } } } diff --git a/iceprog/Makefile b/iceprog/Makefile index 9727257..3cb07b8 100644 --- a/iceprog/Makefile +++ b/iceprog/Makefile @@ -16,21 +16,21 @@ LDLIBS += $(shell for pkg in libftdi1 libftdi; do $(PKG_CONFIG) --silence-errors CFLAGS += $(shell for pkg in libftdi1 libftdi; do $(PKG_CONFIG) --silence-errors --cflags $$pkg && exit; done; ) endif -all: iceprog$(EXE) +all: $(PROGRAM_PREFIX)iceprog$(EXE) -iceprog$(EXE): iceprog.o mpsse.o +$(PROGRAM_PREFIX)iceprog$(EXE): iceprog.o mpsse.o $(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS) install: all mkdir -p $(DESTDIR)$(PREFIX)/bin - cp iceprog$(EXE) $(DESTDIR)$(PREFIX)/bin/iceprog$(EXE) + cp $(PROGRAM_PREFIX)iceprog$(EXE) $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)iceprog$(EXE) uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/iceprog$(EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)iceprog$(EXE) clean: - rm -f iceprog - rm -f iceprog.exe + rm -f $(PROGRAM_PREFIX)iceprog + rm -f $(PROGRAM_PREFIX)iceprog.exe rm -f *.o *.d -include *.d diff --git a/iceprog/iceprog.c b/iceprog/iceprog.c index 798ff75..b04fe65 100644 --- a/iceprog/iceprog.c +++ b/iceprog/iceprog.c @@ -310,6 +310,28 @@ static void flash_bulk_erase() flash_chip_deselect(); } +static void flash_4kB_sector_erase(int addr) +{ + fprintf(stderr, "erase 4kB sector at 0x%06X..\n", addr); + + uint8_t command[4] = { FC_SE, (uint8_t)(addr >> 16), (uint8_t)(addr >> 8), (uint8_t)addr }; + + flash_chip_select(); + mpsse_send_spi(command, 4); + flash_chip_deselect(); +} + +static void flash_32kB_sector_erase(int addr) +{ + fprintf(stderr, "erase 64kB sector at 0x%06X..\n", addr); + + uint8_t command[4] = { FC_BE32, (uint8_t)(addr >> 16), (uint8_t)(addr >> 8), (uint8_t)addr }; + + flash_chip_select(); + mpsse_send_spi(command, 4); + flash_chip_deselect(); +} + static void flash_64kB_sector_erase(int addr) { fprintf(stderr, "erase 64kB sector at 0x%06X..\n", addr); @@ -450,6 +472,7 @@ static void help(const char *progname) fprintf(stderr, " -s slow SPI (50 kHz instead of 6 MHz)\n"); fprintf(stderr, " -k keep flash in powered up state (i.e. skip power down command)\n"); fprintf(stderr, " -v verbose output\n"); + fprintf(stderr, " -i [4,32,64] select erase block size [default: 64k]\n"); fprintf(stderr, "\n"); fprintf(stderr, "Mode of operation:\n"); fprintf(stderr, " [default] write file contents to flash, then verify\n"); @@ -510,6 +533,7 @@ int main(int argc, char **argv) my_name = argv[0] + i + 1; int read_size = 256 * 1024; + int erase_block_size = 64; int erase_size = 0; int rw_offset = 0; @@ -541,11 +565,23 @@ int main(int argc, char **argv) /* Decode command line parameters */ int opt; char *endptr; - while ((opt = getopt_long(argc, argv, "d:I:rR:e:o:cbnStvspXk", long_options, NULL)) != -1) { + while ((opt = getopt_long(argc, argv, "d:i:I:rR:e:o:cbnStvspXk", long_options, NULL)) != -1) { switch (opt) { case 'd': /* device string */ devstr = optarg; break; + case 'i': /* block erase size */ + if (!strcmp(optarg, "4")) + erase_block_size = 4; + else if (!strcmp(optarg, "32")) + erase_block_size = 32; + else if (!strcmp(optarg, "64")) + erase_block_size = 64; + else { + fprintf(stderr, "%s: `%s' is not a valid erase block size (must be `4', `32' or `64')\n", my_name, optarg); + return EXIT_FAILURE; + } + break; case 'I': /* FTDI Chip interface select */ if (!strcmp(optarg, "A")) ifnum = 0; @@ -893,12 +929,24 @@ int main(int argc, char **argv) { fprintf(stderr, "file size: %ld\n", file_size); - int begin_addr = rw_offset & ~0xffff; - int end_addr = (rw_offset + file_size + 0xffff) & ~0xffff; + int block_size = erase_block_size << 10; + int block_mask = block_size - 1; + int begin_addr = rw_offset & ~block_mask; + int end_addr = (rw_offset + file_size + block_mask) & ~block_mask; - for (int addr = begin_addr; addr < end_addr; addr += 0x10000) { + for (int addr = begin_addr; addr < end_addr; addr += block_size) { flash_write_enable(); - flash_64kB_sector_erase(addr); + switch(erase_block_size) { + case 4: + flash_4kB_sector_erase(addr); + break; + case 32: + flash_32kB_sector_erase(addr); + break; + case 64: + flash_64kB_sector_erase(addr); + break; + } if (verbose) { fprintf(stderr, "Status after block erase:\n"); flash_read_status(); diff --git a/icetime/Makefile b/icetime/Makefile index 38e2fe6..33231ca 100644 --- a/icetime/Makefile +++ b/icetime/Makefile @@ -6,12 +6,12 @@ ifeq ($(STATIC),1) LDFLAGS += -static endif -all: icetime$(EXE) +all: $(PROGRAM_PREFIX)icetime$(EXE) CHIPS=lp384 lp1k lp8k hx1k hx8k up5k ifeq ($(EXE),.js) -icetime$(EXE): | share/$(CHIPDB_SUBDIR)/chipdb-384.txt share/$(CHIPDB_SUBDIR)/chipdb-1k.txt share/$(CHIPDB_SUBDIR)/chipdb-8k.txt share/$(CHIPDB_SUBDIR)/chipdb-5k.txt +$(PROGRAM_PREFIX)icetime$(EXE): | share/$(CHIPDB_SUBDIR)/chipdb-384.txt share/$(CHIPDB_SUBDIR)/chipdb-1k.txt share/$(CHIPDB_SUBDIR)/chipdb-8k.txt share/$(CHIPDB_SUBDIR)/chipdb-5k.txt share/$(CHIPDB_SUBDIR)/chipdb-384.txt: ../icebox/chipdb-384.txt mkdir -p share/$(CHIPDB_SUBDIR) @@ -28,7 +28,7 @@ share/$(CHIPDB_SUBDIR)/chipdb-5k.txt: ../icebox/chipdb-5k.txt override LDFLAGS += --embed-file share endif -icetime$(EXE): icetime.o iceutil.o $(addsuffix .o, $(addprefix timings-, $(CHIPS))) +$(PROGRAM_PREFIX)icetime$(EXE): icetime.o iceutil.o $(addsuffix .o, $(addprefix timings-, $(CHIPS))) $(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS) timings-%.cc: timings.py ../icefuzz/timings_%.txt @@ -36,12 +36,12 @@ timings-%.cc: timings.py ../icefuzz/timings_%.txt install: all mkdir -p $(DESTDIR)$(PREFIX)/bin - mkdir -p $(DESTDIR)$(PREFIX)/share/icebox - cp icetime$(EXE) $(DESTDIR)$(PREFIX)/bin/icetime$(EXE) - cp ../icefuzz/timings_*.txt $(DESTDIR)$(PREFIX)/share/icebox/ + mkdir -p $(DESTDIR)$(PREFIX)/share/$(PROGRAM_PREFIX)icebox + cp $(PROGRAM_PREFIX)icetime$(EXE) $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icetime$(EXE) + cp ../icefuzz/timings_*.txt $(DESTDIR)$(PREFIX)/share/$(PROGRAM_PREFIX)icebox/ uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/icetime$(EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icetime$(EXE) # View timing netlist: @@ -65,7 +65,7 @@ test: test0 test1 test2 test3 test4 test5 test6 test7 test8 test9 show: show0 show1 show2 show3 show4 show5 show6 show7 show8 show9 clean: - rm -f icetime$(EXE) icetime.exe *.o *.d timings-*.cc + rm -f $(PROGRAM_PREFIX)icetime$(EXE) $(PROGRAM_PREFIX)icetime.exe *.o *.d timings-*.cc rm -rf test[0-9]* -include *.d diff --git a/icetime/icetime.cc b/icetime/icetime.cc index cc37625..0735b00 100644 --- a/icetime/icetime.cc +++ b/icetime/icetime.cc @@ -30,6 +30,7 @@ #include <functional> #include <map> #include <set> +#include <stdexcept> #include <string> #include <tuple> #include <vector> |