diff --git a/Makefile b/Makefile index 963d40c3..51d424de 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,8 @@ CHS_ROOT ?= $(shell pwd) BENDER ?= bender -d $(CHS_ROOT) +all: + include cheshire.mk # Inside the repo, forward (prefixed) all, nonfree, and clean targets diff --git a/docs/gs.md b/docs/gs.md index c1e1e0b2..c9f3f388 100644 --- a/docs/gs.md +++ b/docs/gs.md @@ -40,7 +40,6 @@ To build different parts of Cheshire, run `make` followed by these targets: - `hw-all`: generated hardware, including IPs and boot ROM - `sw-all`: software running on our hardware - `sim-all`(†): scripts and external models for simulation -- `xilinx-all`: scripts for Xilinx FPGA implementation † *`sim-all` will download externally provided peripheral simulation models, some proprietary and with non-free license terms, from their publically accessible sources; see `Makefile` for details. By running `sim-all` or the default target `all`, you accept this.* diff --git a/docs/img/arch.svg b/docs/img/arch.svg index 93530b36..c3a0a4c6 100644 --- a/docs/img/arch.svg +++ b/docs/img/arch.svg @@ -819,9 +819,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.4142136" - inkscape:cx="444.89247" - inkscape:cy="-94.413926" + inkscape:zoom="1" + inkscape:cx="188.87038" + inkscape:cy="298.84387" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="true" @@ -863,7 +863,7 @@ image/svg+xml - + @@ -1740,7 +1740,7 @@ x="41.880936" y="95.492058" id="text874-8-4-2-1-3-9-8" - transform="matrix(0.92100894,0,0,1.0857658,-1.9999998,0.35840329)">