From ae5f878d6acadabaa671a7a30b87e16eb1d718a7 Mon Sep 17 00:00:00 2001 From: Megan Wachs Date: Wed, 30 Nov 2016 10:55:18 -0800 Subject: Bump Everything to Match new Freedom Repo (#8) * Bump tool versions * Use version of OpenOCD which can load programs into flash * Bump OpenOCD to Handle ISSI Flash Programming * Update Header files * add initial support for hifive1 * add dhrystone * add clock helper functions * add openocd cfg file * Demo_GPIO checkpoint -- compiles and runs but no blinky LEDs * Remove riscv-tests submodule * Remove FPGA files, as they are no longer relevant to this Repository * Add openocd_upload script * Add Pinmux Mappings Adding the pinmux mappings to the Platform Header * Add IOF Mappings to platform header * Re-order the IOF Mapping declarations * Add more useful things to platform headers * Get GPIO Demo working again (except interrupts aren't working) * Update README with more OS packages needed A bare ubuntu-16.04.1-server installation could not run `make tools` without these packages. * bump openocd to get SCKDIV fix * Remove duplicated help text for run_debug target * Add package to README that is needed for openocd build Without this package I was seeing two different failures like below when running `make tools`. /home/scottj/freedom-e-sdk/openocd/configure: line 4533: syntax error near unexpected token `0.23' /home/scottj/freedom-e-sdk/openocd/configure: line 4533: `PKG_PROG_PKG_CONFIG(0.23)' Makefile:70: recipe for target '/home/scottj/freedom-e-sdk/toolchain/bin/openocd' failed make: *** [/home/scottj/freedom-e-sdk/toolchain/bin/openocd] Error 2 ... or ... + autoconf configure.ac:12: error: possibly undefined macro: AC_MSG_WARN If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:240: error: possibly undefined macro: AC_MSG_NOTICE configure.ac:342: error: possibly undefined macro: AC_DEFINE Makefile:70: recipe for target '/home/scottj/freedom-e-sdk/toolchain/bin/openocd' failed make: *** [/home/scottj/freedom-e-sdk/toolchain/bin/openocd] Error 1 * Bump OpenOCD to not overwrite SCKDIV when flashing * Roll back CoreMark --- bootrom/bram.mk | 79 --------------------------------------------------------- 1 file changed, 79 deletions(-) delete mode 100644 bootrom/bram.mk (limited to 'bootrom/bram.mk') diff --git a/bootrom/bram.mk b/bootrom/bram.mk deleted file mode 100644 index 2c7875a..0000000 --- a/bootrom/bram.mk +++ /dev/null @@ -1,79 +0,0 @@ -ifndef _BRAM_MK -_BRAM_MK := # defined - -BRAM_ADDR := 0x1000 - -BASEDIR := $(dir $(lastword $(MAKEFILE_LIST))) -BASEDIR := $(BASEDIR:/=) -DATADIR := $(BASEDIR)/common - -LDSCRIPT := $(DATADIR)/bram.ld -MEMSCRIPT := $(DATADIR)/mem.awk - -BITFILEDIR := $(BASEDIR)/../bitfile -BITFILE_VERSION ?= 0-1 - -BITFILE := $(BITFILEDIR)/freedom-e300-arty-$(BITFILE_VERSION).bit -CFGFILE := $(BITFILEDIR)/FreedomE-$(BITFILE_VERSION).cfg -MEMINFO := $(BITFILEDIR)/freedom-e300-arty-$(BITFILE_VERSION).mmi -BRAM_INST := `cat $(BITFILEDIR)/freedom-e300-arty-$(BITFILE_VERSION)-bootrom.txt` - -XLEN = 32 -BRAM_WIDTH=64 - -all: mcs - -$(BITFILE): - @echo "In order to get Version $(BITFILE_VERSION) of the bitfile:" - @echo "" - @cat $(BITFILEDIR)/README.md - -CC := ../../toolchain/bin/riscv$(XLEN)-unknown-elf-gcc -UPDATEMEM ?= updatemem - -CDEFINES += -DCFG_STRING=\"$(CFGFILE)\" - -CFLAGS ?= -m$(XLEN) -O2 -std=c11 -pedantic -Wall \ - -nostartfiles -fno-common -mcmodel=medany -g \ - $(CDEFINES) - -LDFLAGS ?= -T$(LDSCRIPT) -static -nostdlib -OBJCOPY ?= objcopy -elf: $(PROG).elf -hex: $(PROG).hex -mem: $(PROG).impl.mem -mcs: $(PROG).mcs - -$(PROG).elf: $(SRCS) $(EXTRAS) $(CFGFILE) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(SRCS) - -$(PROG).hex: $(PROG).elf - $(OBJCOPY) -S -O verilog --change-addresses -$(BRAM_ADDR) $< $@ - -# Manually reverse the byte order due to limitations in UpdateMEM. -# Per UG898: "When UpdateMEM inputs data, it takes data from data input -# files in Bit Lane sized chunks from the most right value first to the -# left most. For example, if the first 64 bits of input data are -# 0xB47DDE02826A8419 then the value 0xB4 is the first value to be set -# into a Block RAM." -$(PROG).impl.mem: $(PROG).hex $(MEMSCRIPT) - awk -v WIDTH=$(BRAM_WIDTH) -v REVERSE=1 -f $(MEMSCRIPT) $< > $@ - -.PHONY: $(PROG).mcs -$(PROG).mcs : $(BITFILE) $(PROG).impl.mem - @echo "" - @echo "" - @echo "TO COMPLETE THE BUILD OF $(PROG).mcs, " - @echo "ENTER THE FOLLOWING IN THE VIVADO TCL WINDOW:" - @echo "" - @echo "cd `pwd`" - @echo "" - @echo "exec $(UPDATEMEM) -meminfo $(MEMINFO) -data $(PROG).impl.mem -proc $(BRAM_INST) -bit $(BITFILE) --out $(PROG).bit -force" - @echo "" - @echo "write_cfgmem -format mcs -interface spix4 -size 16 -loadbit {up 0x0 $(PROG).bit} -file $(PROG).mcs -force" - @echo "" - -clean: - rm -f -- $(foreach ext,elf hex impl.mem bit mcs,$(PROG).$(ext)) - -endif # _BRAM_MK -- cgit v1.2.1-18-gbd029