Merge 2b57ea2194 into 3cdcf4b009

CodeOfConduct

@@ -55,8 +55,9 @@ further defined and clarified by project maintainers.
 Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at office@yosyshq.com.
-All complaints will be reviewed and investigated and
+reported by contacting the project team at clifford@clifford.at (and/or
+cliffordvienna@gmail.com if you think your mail to the other address got
+stuck in the spam filter). All complaints will be reviewed and investigated and
 will result in a response that is deemed necessary and appropriate to the
 circumstances. The project team is obligated to maintain confidentiality with
 regard to the reporter of an incident.  Further details of specific enforcement

docs/source/conf.py

@@ -13,9 +13,7 @@ author = 'YosysHQ'
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
 
-extensions = ['sphinx_rtd_theme',
-              'sphinxcontrib.rsvgconverter'
-              ]
+extensions = ['sphinx_rtd_theme']
 
 templates_path = ['_templates']
 exclude_patterns = []
@@ -33,5 +31,3 @@ html_theme_options = {
     "titles_only": False
 }
 html_static_path = ['_static']
-
-latex_engine = 'lualatex'

docs/source/requirements.txt

@@ -1,3 +1,2 @@
 sphinx
 sphinx_rtd_theme 
-sphinxcontrib-svg2pdfconverter

icebox/icebox.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-#  Copyright (C) 2015  Claire Xenia Wolf <claire@clairexen.net>
+#  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 #
 #  Permission to use, copy, modify, and/or distribute this software for any
 #  purpose with or without fee is hereby granted, provided that the above

icebox/icebox_chipdb.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-#  Copyright (C) 2015  Claire Xenia Wolf <claire@clairexen.net>
+#  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 #
 #  Permission to use, copy, modify, and/or distribute this software for any
 #  purpose with or without fee is hereby granted, provided that the above

icebox/icebox_colbuf.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-#  Copyright (C) 2015  Claire Xenia Wolf <claire@clairexen.net>
+#  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 #
 #  Permission to use, copy, modify, and/or distribute this software for any
 #  purpose with or without fee is hereby granted, provided that the above

icebox/icebox_diff.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-#  Copyright (C) 2015  Claire Xenia Wolf <claire@clairexen.net>
+#  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 #
 #  Permission to use, copy, modify, and/or distribute this software for any
 #  purpose with or without fee is hereby granted, provided that the above

icebox/icebox_explain.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-#  Copyright (C) 2015  Claire Xenia Wolf <claire@clairexen.net>
+#  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 #
 #  Permission to use, copy, modify, and/or distribute this software for any
 #  purpose with or without fee is hereby granted, provided that the above

icebox/icebox_html.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-#  Copyright (C) 2015  Claire Xenia Wolf <claire@clairexen.net>
+#  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 #
 #  Permission to use, copy, modify, and/or distribute this software for any
 #  purpose with or without fee is hereby granted, provided that the above

icebox/icebox_maps.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-#  Copyright (C) 2015  Claire Xenia Wolf <claire@clairexen.net>
+#  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 #
 #  Permission to use, copy, modify, and/or distribute this software for any
 #  purpose with or without fee is hereby granted, provided that the above

icebox/icebox_stat.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-#  Copyright (C) 2015  Claire Xenia Wolf <claire@clairexen.net>
+#  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 #
 #  Permission to use, copy, modify, and/or distribute this software for any
 #  purpose with or without fee is hereby granted, provided that the above

icebox/icebox_vlog.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-#  Copyright (C) 2015  Claire Xenia Wolf <claire@clairexen.net>
+#  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 #
 #  Permission to use, copy, modify, and/or distribute this software for any
 #  purpose with or without fee is hereby granted, provided that the above

icebram/icebram.cc

@@ -1,5 +1,5 @@
 //
-//  Copyright (C) 2016  Claire Xenia Wolf <claire@clairexen.net>
+//  Copyright (C) 2016  Clifford Wolf <clifford@clifford.at>
 //  Copyright (C) 2023  Sylvain Munaut <tnt@246tNt.com>
 //
 //  Permission to use, copy, modify, and/or distribute this software for any

icepack/icepack.cc

@@ -1,5 +1,5 @@
 //
-//  Copyright (C) 2015  Claire Xenia Wolf <claire@clairexen.net>
+//  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 //
 //  Based on a reference implementation provided by Mathias Lasser
 //

icepll/icepll.cc

@@ -1,5 +1,5 @@
 //
-//  Copyright (C) 2015  Claire Xenia Wolf <claire@clairexen.net>
+//  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 //
 //  Permission to use, copy, modify, and/or distribute this software for any
 //  purpose with or without fee is hereby granted, provided that the above

iceprog/iceprog.c

@@ -1,7 +1,7 @@
 /*
  *  iceprog -- simple programming tool for FTDI-based Lattice iCE programmers
  *
- *  Copyright (C) 2015  Claire Xenia Wolf <claire@clairexen.net>
+ *  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
  *  Copyright (C) 2018  Piotr Esden-Tempski <piotr@esden.net>
  *
  *  Permission to use, copy, modify, and/or distribute this software for any
@@ -549,14 +549,14 @@ static void help(const char *progname)
 	fprintf(stderr, "  programming the flash chip and one zero ohm resistor must be desoldered\n");
 	fprintf(stderr, "  and the FT2232H SI pin must be connected to the iCE SPI_SI pin, as shown\n");
 	fprintf(stderr, "  in this picture:\n");
-	fprintf(stderr, "  https://github.com/yosyshq/icestorm/blob/master/docs/source/_static/images/icestick.jpg\n");
+	fprintf(stderr, "  http://www.clifford.at/gallery/2014-elektronik/IMG_20141115_183838\n");
 	fprintf(stderr, "\n");
 	fprintf(stderr, "Notes for the iCE40-HX8K Breakout Board:\n");
 	fprintf(stderr, "  Make sure that the jumper settings on the board match the selected\n");
 	fprintf(stderr, "  mode (SRAM or FLASH). See the iCE40-HX8K user manual for details.\n");
 	fprintf(stderr, "\n");
 	fprintf(stderr, "If you have a bug report, please file an issue on github:\n");
-	fprintf(stderr, "  https://github.com/YosysHQ/icestorm/issues\n");
+	fprintf(stderr, "  https://github.com/cliffordwolf/icestorm/issues\n");
 }
 
 int main(int argc, char **argv)

iceprog/mpsse.c

@@ -1,7 +1,7 @@
 /*
  *  iceprog -- simple programming tool for FTDI-based Lattice iCE programmers
  *
- *  Copyright (C) 2015  Claire Xenia Wolf <claire@clairexen.net>
+ *  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
  *  Copyright (C) 2018  Piotr Esden-Tempski <piotr@esden.net>
  *
  *  Permission to use, copy, modify, and/or distribute this software for any
@@ -360,4 +360,4 @@ void mpsse_close(void)
 	ftdi_disable_bitbang(&mpsse_ftdic);
 	ftdi_usb_close(&mpsse_ftdic);
 	ftdi_deinit(&mpsse_ftdic);
-}
+}

iceprog/mpsse.h

@@ -1,7 +1,7 @@
 /*
  *  iceprog -- simple programming tool for FTDI-based Lattice iCE programmers
  *
- *  Copyright (C) 2015  Claire Xenia Wolf <claire@clairexen.net>
+ *  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
  *  Copyright (C) 2018  Piotr Esden-Tempski <piotr@esden.net>
  *
  *  Permission to use, copy, modify, and/or distribute this software for any

icetime/icetime.cc

@@ -1,5 +1,5 @@
 //
-//  Copyright (C) 2015  Claire Xenia Wolf <claire@clairexen.net>
+//  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 //
 //  Permission to use, copy, modify, and/or distribute this software for any
 //  purpose with or without fee is hereby granted, provided that the above

icetime/iceutil.cc

@@ -1,7 +1,7 @@
 /*
  *  yosys -- Yosys Open SYnthesis Suite
  *
- *  Copyright (C) 2012  Claire Xenia Wolf <claire@clairexen.net>
+ *  Copyright (C) 2012  Clifford Wolf <clifford@clifford.at>
  *
  *  Permission to use, copy, modify, and/or distribute this software for any
  *  purpose with or without fee is hereby granted, provided that the above