From 2776953012b2951945fd04ac296a286090e5ddf7 Mon Sep 17 00:00:00 2001 From: umarcor Date: Mon, 5 Oct 2020 08:21:59 +0200 Subject: [PATCH] move 'verilog/pcf' to root --- {verilog/pcf => pcf}/fomu-evt2.pcf | 0 {verilog/pcf => pcf}/fomu-evt3.pcf | 0 {verilog/pcf => pcf}/fomu-hacker.pcf | 0 {verilog/pcf => pcf}/fomu-pvt.pcf | 0 verilog/blink-expanded/Makefile | 2 +- verilog/blink/Makefile | 12 ++++++------ 6 files changed, 7 insertions(+), 7 deletions(-) rename {verilog/pcf => pcf}/fomu-evt2.pcf (100%) rename {verilog/pcf => pcf}/fomu-evt3.pcf (100%) rename {verilog/pcf => pcf}/fomu-hacker.pcf (100%) rename {verilog/pcf => pcf}/fomu-pvt.pcf (100%) diff --git a/verilog/pcf/fomu-evt2.pcf b/pcf/fomu-evt2.pcf similarity index 100% rename from verilog/pcf/fomu-evt2.pcf rename to pcf/fomu-evt2.pcf diff --git a/verilog/pcf/fomu-evt3.pcf b/pcf/fomu-evt3.pcf similarity index 100% rename from verilog/pcf/fomu-evt3.pcf rename to pcf/fomu-evt3.pcf diff --git a/verilog/pcf/fomu-hacker.pcf b/pcf/fomu-hacker.pcf similarity index 100% rename from verilog/pcf/fomu-hacker.pcf rename to pcf/fomu-hacker.pcf diff --git a/verilog/pcf/fomu-pvt.pcf b/pcf/fomu-pvt.pcf similarity index 100% rename from verilog/pcf/fomu-pvt.pcf rename to pcf/fomu-pvt.pcf diff --git a/verilog/blink-expanded/Makefile b/verilog/blink-expanded/Makefile index 41f0ee2..d0af1e9 100644 --- a/verilog/blink-expanded/Makefile +++ b/verilog/blink-expanded/Makefile @@ -9,7 +9,7 @@ NEXTPNR ?= nextpnr-ice40 YOSYS ?= yosys ICEPACK ?= icepack -PCF_PATH ?= ../pcf +PCF_PATH ?= ../../pcf # Add Windows and Unix support RM = rm -rf diff --git a/verilog/blink/Makefile b/verilog/blink/Makefile index 54e6c19..4e0ed20 100644 --- a/verilog/blink/Makefile +++ b/verilog/blink/Makefile @@ -8,19 +8,19 @@ # Configuration is performed by setting the environment variable FOMU_REV accordingly. ifeq ($(FOMU_REV),evt1) YOSYSFLAGS?= -D EVT=1 -PNRFLAGS ?= --up5k --package sg48 --pcf ../pcf/fomu-evt2.pcf +PNRFLAGS ?= --up5k --package sg48 --pcf ../../pcf/fomu-evt2.pcf else ifeq ($(FOMU_REV),evt2) YOSYSFLAGS?= -D EVT=1 -PNRFLAGS ?= --up5k --package sg48 --pcf ../pcf/fomu-evt2.pcf +PNRFLAGS ?= --up5k --package sg48 --pcf ../../pcf/fomu-evt2.pcf else ifeq ($(FOMU_REV),evt3) YOSYSFLAGS?= -D EVT=1 -PNRFLAGS ?= --up5k --package sg48 --pcf ../pcf/fomu-evt3.pcf +PNRFLAGS ?= --up5k --package sg48 --pcf ../../pcf/fomu-evt3.pcf else ifeq ($(FOMU_REV),hacker) YOSYSFLAGS?= -D HACKER=1 -PNRFLAGS ?= --up5k --package uwg30 --pcf ../pcf/fomu-hacker.pcf +PNRFLAGS ?= --up5k --package uwg30 --pcf ../../pcf/fomu-hacker.pcf else ifeq ($(FOMU_REV),pvt) YOSYSFLAGS?= -D PVT=1 -PNRFLAGS ?= --up5k --package uwg30 --pcf ../pcf/fomu-pvt.pcf +PNRFLAGS ?= --up5k --package uwg30 --pcf ../../pcf/fomu-pvt.pcf else $(error Unrecognized FOMU_REV value. must be "evt1", "evt2", "evt3", "pvt", or "hacker") endif @@ -40,7 +40,7 @@ blink.json: blink.v # Use **nextpnr** to generate the FPGA configuration. # This is called the **place** and **route** step. -blink.asc: blink.json ../pcf/fomu-hacker.pcf +blink.asc: blink.json nextpnr-ice40 \ $(PNRFLAGS) \ --json blink.json \