diff options
| author | Aki Van Ness <aki@lethalbit.net> | 2022-09-15 06:32:45 -0400 |
|---|---|---|
| committer | Aki Van Ness <aki@lethalbit.net> | 2022-09-15 06:32:45 -0400 |
| commit | ca43729f124466b816f922842353feeb3f6f8e84 (patch) | |
| tree | dcb5191f0f33237ae561bfad064bd20fc397e728 /examples/up5k_rgb | |
| parent | 2bc541743ada3542c6da36a50e66303b9cbd2059 (diff) | |
| download | icestorm-ca43729f124466b816f922842353feeb3f6f8e84.tar.gz icestorm-ca43729f124466b816f922842353feeb3f6f8e84.tar.bz2 icestorm-ca43729f124466b816f922842353feeb3f6f8e84.zip | |
Replaced instances of `arachne-pnr` with the `nextpnr-ice40` equivalent
Diffstat (limited to 'examples/up5k_rgb')
| -rw-r--r-- | examples/up5k_rgb/.gitignore | 18 | ||||
| -rw-r--r-- | examples/up5k_rgb/Makefile | 13 | ||||
| -rw-r--r-- | examples/up5k_rgb/Makefile.uwg30 | 12 |
3 files changed, 18 insertions, 25 deletions
diff --git a/examples/up5k_rgb/.gitignore b/examples/up5k_rgb/.gitignore index dd32bfb..348ed09 100644 --- a/examples/up5k_rgb/.gitignore +++ b/examples/up5k_rgb/.gitignore @@ -1,12 +1,6 @@ -*.bin -*.blif -*.asc -*.rpt -*.glb -*.psb -*.sdf -*.vsb -*.bin -*.tmp/ -*.exp -*.vlog +* +!.gitignore +!Makefile* +!README +!rgb*.pcf +!rgb.v diff --git a/examples/up5k_rgb/Makefile b/examples/up5k_rgb/Makefile index 51c1f72..2e7e8f2 100644 --- a/examples/up5k_rgb/Makefile +++ b/examples/up5k_rgb/Makefile @@ -1,20 +1,19 @@ PROJ = rgb PIN_DEF = rgb.pcf DEVICE = up5k +PACKAGE = sg48 -ARACHNE = arachne-pnr -ARACHNE_ARGS = ICEPACK = icepack ICETIME = icetime ICEPROG = iceprog all: $(PROJ).bin -%.blif: %.v - yosys -p 'synth_ice40 -top top -blif $@' $< +%.json: %.v + yosys -p 'synth_ice40 -top top -json $@' $< -%.asc: $(PIN_DEF) %.blif - $(ARACHNE) $(ARACHNE_ARGS) -d $(subst up,,$(subst hx,,$(subst lp,,$(DEVICE)))) -o $@ -p $^ +%.asc: $(PIN_DEF) %.json + nextpnr-ice40 --$(DEVICE) --package $(PACKAGE) --asc $@ --pcf $< --json $*.json %.bin: %.asc $(ICEPACK) $< $@ @@ -30,7 +29,7 @@ sudo-prog: $(PROJ).bin sudo $(ICEPROG) -S $< clean: - rm -f $(PROJ).blif $(PROJ).asc $(PROJ).rpt $(PROJ).bin + rm -f $(PROJ).json $(PROJ).asc $(PROJ).rpt $(PROJ).bin .SECONDARY: .PHONY: all prog clean diff --git a/examples/up5k_rgb/Makefile.uwg30 b/examples/up5k_rgb/Makefile.uwg30 index b3755ff..41e776c 100644 --- a/examples/up5k_rgb/Makefile.uwg30 +++ b/examples/up5k_rgb/Makefile.uwg30 @@ -1,9 +1,9 @@ PROJ = rgb PIN_DEF = rgb_uwg30.pcf DEVICE = up5k +PACKAGE = uwg30 + -ARACHNE = arachne-pnr -ARACHNE_ARGS = ICEPACK = icepack ICETIME = icetime ICEPROG = iceprog @@ -11,10 +11,10 @@ ICEPROG = iceprog all: $(PROJ).bin %.blif: %.v - yosys -p 'synth_ice40 -top top -blif $@' $< + yosys -p 'synth_ice40 -top top -json $@' $< -%.asc: $(PIN_DEF) %.blif - $(ARACHNE) $(ARACHNE_ARGS) -d $(subst up,,$(subst hx,,$(subst lp,,$(DEVICE)))) -o $@ -p $^ -P uwg30 +%.asc: $(PIN_DEF) %.json + nextpnr-ice40 --$(DEVICE) --package $(PACKAGE) --asc $@ --pcf $< --json $*.json %.bin: %.asc $(ICEPACK) $< $@ @@ -30,7 +30,7 @@ sudo-prog: $(PROJ).bin sudo $(ICEPROG) -S $< clean: - rm -f $(PROJ).blif $(PROJ).asc $(PROJ).rpt $(PROJ).bin + rm -f $(PROJ).json $(PROJ).asc $(PROJ).rpt $(PROJ).bin .SECONDARY: .PHONY: all prog clean |