Merge pull request #336 from paulusmack/fixes

Makefile: Correct parameters for the Orange Crab 85F
fpu-constant
Michael Neuling 3 years ago committed by GitHub
commit 8a030502a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -154,7 +154,7 @@ FPGA_TARGET ?= ORANGE-CRAB
# with yosys, so make it smaller for now as a workaround. # with yosys, so make it smaller for now as a workaround.
ICACHE_NUM_LINES=4 ICACHE_NUM_LINES=4


# OrangeCrab with ECP85 # OrangeCrab with ECP85 (original v0.0 with UM5G-85 chip)
ifeq ($(FPGA_TARGET), ORANGE-CRAB) ifeq ($(FPGA_TARGET), ORANGE-CRAB)
RESET_LOW=true RESET_LOW=true
CLK_INPUT=48000000 CLK_INPUT=48000000
@ -166,6 +166,18 @@ OPENOCD_JTAG_CONFIG=openocd/olimex-arm-usb-tiny-h.cfg
OPENOCD_DEVICE_CONFIG=openocd/LFE5UM5G-85F.cfg OPENOCD_DEVICE_CONFIG=openocd/LFE5UM5G-85F.cfg
endif endif


# OrangeCrab with ECP85 (v0.21)
ifeq ($(FPGA_TARGET), ORANGE-CRAB-0.21)
RESET_LOW=true
CLK_INPUT=48000000
CLK_FREQUENCY=40000000
LPF=constraints/orange-crab.lpf
PACKAGE=CSFBGA285
NEXTPNR_FLAGS=--85k --speed 8 --freq 40
OPENOCD_JTAG_CONFIG=openocd/olimex-arm-usb-tiny-h.cfg
OPENOCD_DEVICE_CONFIG=openocd/LFE5U-85F.cfg
endif

# ECP5-EVN # ECP5-EVN
ifeq ($(FPGA_TARGET), ECP5-EVN) ifeq ($(FPGA_TARGET), ECP5-EVN)
RESET_LOW=true RESET_LOW=true
@ -213,7 +225,7 @@ microwatt_out.config: microwatt.json $(LPF)
mv -f $@.tmp $@ mv -f $@.tmp $@


microwatt.bit: microwatt_out.config microwatt.bit: microwatt_out.config
$(ECPPACK) --svf microwatt.svf $< $@ $(ECPPACK) --compress --freq 38.8 --svf microwatt.svf $< $@


microwatt.svf: microwatt.bit microwatt.svf: microwatt.bit



Loading…
Cancel
Save