GlasgowEmbedded · Jun 15, 2020 · Jun 15, 2020 · Jun 15, 2020 · Jun 15, 2020 · Jun 16, 2020
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@ build/
 *.v
 *.vcd
 *.gtkw
-*.ihex
 *.log
 *.*b[ac]k
 _autosave-*

diff --git a/.travis.yml b/.travis.yml
@@ -7,19 +7,11 @@ python:
 addons:
   apt:
     update: true
-cache:
-  directories:
-    - "$HOME/.ccache"
-    - "$HOME/.local"
 before_install:
-  - export PATH="/usr/lib/ccache:$HOME/.local/bin:$PATH"
   - sudo apt install sdcc
+  - pip install yowasp-yosys yowasp-nextpnr-ice40-5k yowasp-nextpnr-ice40-8k
+  - export YOSYS=yowasp-yosys NEXTPNR_ICE40=yowasp-nextpnr-ice40 ICEPACK=yowasp-icepack
 install:
-  - "(cd vendor/libfx2/software && SDAR='sdcclib r' python setup.py install)"
-  - git clone https://github.com/YosysHQ/yosys
-  - (cd yosys && if ! yosys -V || [ $(git rev-parse HEAD $(yosys -V | awk 'match($0,/sha1 ([0-9a-f]+)/,m) { print m[1] }') | uniq | wc -l) != 1 ]; then make CONFIG=gcc ENABLE_ABC=1 PREFIX=$HOME/.local install; fi)
-  - git clone https://github.com/YosysHQ/nextpnr
-  - (cd nextpnr && if ! nextpnr-ice40 --version || [ $(git rev-parse HEAD $(nextpnr-ice40 --version | awk 'match($0,/sha1 ([0-9a-f]+)/,m) { print m[1] }') | uniq | wc -l) != 1 ]; then sudo apt install libeigen3-dev python3-dev libboost-all-dev && (git clone https://github.com/cliffordwolf/icestorm && cd icestorm && make ICEPROG=0 PREFIX=$HOME/.local install) && mkdir build-ice40 && cd build-ice40 && cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DBUILD_GUI=OFF -DARCH=ice40 -DICEBOX_ROOT=$HOME/.local/share/icebox && make install; fi)
-script:
   - "(cd software && python setup.py install)"
+script:
   - "(cd software && python -W ignore::DeprecationWarning test.py)"
diff --git a/README.md b/README.md
@@ -26,6 +26,8 @@ Some of the tasks Glasgow can do well are:
     * determine memory parameters via SFDP,
   * read and write ONFI-compatible Flash memories,
     * determine memory parameters via ONFI parameter page,
+  * read and write parallel 27/28/29-series EPROMs, EEPROMs and Flash memories,
+    * determine the extent of floating gate charge decay and rescue data,
   * program and verify AVR microcontrollers with SPI interface,
   * automatically determine unknown JTAG pinout,
   * play back JTAG SVF files,
@@ -80,36 +82,33 @@ Debugging new applets can be hard, especially if bidirectional buses are involve
 
 **Multiple people have reported various issues with the installation instructions below. If any part of these does not work, please file it as a bug, so that the experience can be made more smooth for everyone.**
 
-You will need git, build tools, sdcc, Python 3.7 (or a newer version, in which case replace `3.7` with that version below). On a Debian or Ubuntu system these can be installed with:
+You will need git and Python 3.7 (or a newer version, in which case replace `3.7` with that version below). On a Debian or Ubuntu system these can be installed with:
 
-    apt-get install --no-install-recommends git build-essential sdcc \
-      python3.7 python3-setuptools python3-libusb1 python3-aiohttp python3-bitarray python3-crcmod
+    apt-get install --no-install-recommends git python3.7 python3-setuptools \
+      python3-libusb1 python3-aiohttp python3-bitarray python3-crcmod
 
 You will also need Yosys and nextpnr-ice40, both from the master branch. Follow the setup instructions for [Yosys](https://github.com/yosysHQ/yosys/#setup) and [nextpnr](https://github.com/YosysHQ/nextpnr/#nextpnr-ice40).
 
 Obtain the source code:
 
     git clone https://github.com/GlasgowEmbedded/glasgow
     cd glasgow
-    git submodule update --init vendor/libfx2
 
 Configure your system to allow unprivileged access (for anyone in the `plugdev` group) to the Glasgow hardware:
 
     sudo cp config/99-glasgow.rules /etc/udev/rules.d
 
-Install the dependencies and the binaries for the current user:
+Install the dependencies and the scripts for the current user:
 
     cd software
     python3.7 setup.py develop --user
 
-The binaries are placed in `$HOME/.local/bin`, so be sure to add that directory to the `PATH` environment variable; after this, you can run `glasgow` from a terminal. Instead of adjusting `PATH` it is also possible to use `python3.7 -m glasgow.cli`.
+The scripts are placed in `$HOME/.local/bin`, so be sure to add that directory to the `PATH` environment variable; after this, you can run `glasgow` from a terminal. Instead of adjusting `PATH` it is also possible to use `python3.7 -m glasgow.cli`.
 
 To update the source code, do:
 
     cd glasgow
     git pull
-    cd software
-    python3.7 setup.py build_ext
 
 ### ... with Windows?
 

diff --git a/docs/archive b/docs/archive
diff --git a/examples/boilerplate.py b/examples/boilerplate.py
@@ -1,13 +1,19 @@
 import logging
 import asyncio
-from nmigen.compat import *
+from nmigen import *
 
 from ... import *
 
 
-class BoilerplateSubtarget(Module):
+class BoilerplateSubtarget(Elaboratable):
     def __init__(self, pads, in_fifo, out_fifo):
-        pass
+        self.pads     = pads
+        self.in_fifo  = in_fifo
+        self.out_fifo = out_fifo
+
+    def elaborate(self, platform):
+        m = Module()
+        return m
 
 
 class BoilerplateApplet(GlasgowApplet, name="boilerplate"):

diff --git a/firmware/.gitignore b/firmware/.gitignore
@@ -0,0 +1 @@
+*.ihex
-Original file line number
+Diff line change
@@ @@ -6,7 +6,6 @@ build/ @@
     *.v
     *.vcd
     *.gtkw
-    *.ihex
     *.log
     *.*b[ac]k
     _autosave-*
+ −		G00051/Samtech_SX1272_73_rev4.pdf
+ −		G00052/lorawan1.0.3.pdf
+ −		G00053/pms5003-manual_v2-3.pdf
+ −		G00054/pms7003.pdf
+ −		G00055/PALCE16V8.pdf
+ −		G00056/AT29C256.pdf
+ −		G00057/11173G.pdf
+ −		G00058/Atmel-7766-8-bit-AVR-ATmega16U4-32U4_Datasheet.pdf