luke
/
icestorm
mirror of https://github.com/YosysHQ/icestorm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added config.mk, correct DESTDIR/PREFIX usage

This commit is contained in:
Clifford Wolf 2015-12-31 12:05:04 +01:00
parent 2d03b61380
commit b9e6d07e9c
9 changed files with 58 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,28 +1,32 @@
CXX ?= clang include config.mk
all: all:
$(MAKE) -C icebox $(MAKE) -C icebox
$(MAKE) -C icepack $(MAKE) -C icepack
$(MAKE) -C iceprog $(MAKE) -C iceprog
$(MAKE) -C icemulti $(MAKE) -C icemulti
# $(MAKE) -C icetime
clean: clean:
$(MAKE) -C icebox clean $(MAKE) -C icebox clean
$(MAKE) -C icepack clean $(MAKE) -C icepack clean
$(MAKE) -C iceprog clean $(MAKE) -C iceprog clean
$(MAKE) -C icemulti clean $(MAKE) -C icemulti clean
# $(MAKE) -C icetime clean
install: install:
$(MAKE) -C icebox install $(MAKE) -C icebox install
$(MAKE) -C icepack install $(MAKE) -C icepack install
$(MAKE) -C iceprog install $(MAKE) -C iceprog install
$(MAKE) -C icemulti install $(MAKE) -C icemulti install
# $(MAKE) -C icetime install
uninstall: uninstall:
$(MAKE) -C icebox uninstall $(MAKE) -C icebox uninstall
$(MAKE) -C icepack uninstall $(MAKE) -C icepack uninstall
$(MAKE) -C iceprog uninstall $(MAKE) -C iceprog uninstall
$(MAKE) -C icemulti uninstall $(MAKE) -C icemulti uninstall
# $(MAKE) -C icetime uninstall
.PHONY: all clean install uninstall .PHONY: all clean install uninstall

4
config.mk Normal file
View File

@ -0,0 +1,4 @@
CXX = clang
CC = $(CXX)
DESTDIR =
PREFIX = /usr/local

52
icebox/Makefile
View File

@ -1,4 +1,4 @@
DESTDIR = /usr/local include ../config.mk
all: chipdb-1k.txt chipdb-8k.txt all: chipdb-1k.txt chipdb-8k.txt
@ -15,33 +15,33 @@ clean:
rm -f icebox.pyc iceboxdb.pyc rm -f icebox.pyc iceboxdb.pyc
install: all install: all
mkdir -p $(DESTDIR)/share/icebox mkdir -p $(DESTDIR)$(PREFIX)/share/icebox
mkdir -p $(DESTDIR)/bin mkdir -p $(DESTDIR)$(PREFIX)/bin
cp chipdb-1k.txt $(DESTDIR)/share/icebox/ cp chipdb-1k.txt $(DESTDIR)$(PREFIX)/share/icebox/
cp chipdb-8k.txt $(DESTDIR)/share/icebox/ cp chipdb-8k.txt $(DESTDIR)$(PREFIX)/share/icebox/
cp icebox.py $(DESTDIR)/bin/icebox.py cp icebox.py $(DESTDIR)$(PREFIX)/bin/icebox.py
cp iceboxdb.py $(DESTDIR)/bin/iceboxdb.py cp iceboxdb.py $(DESTDIR)$(PREFIX)/bin/iceboxdb.py
cp icebox_chipdb.py $(DESTDIR)/bin/icebox_chipdb cp icebox_chipdb.py $(DESTDIR)$(PREFIX)/bin/icebox_chipdb
cp icebox_diff.py $(DESTDIR)/bin/icebox_diff cp icebox_diff.py $(DESTDIR)$(PREFIX)/bin/icebox_diff
cp icebox_explain.py $(DESTDIR)/bin/icebox_explain cp icebox_explain.py $(DESTDIR)$(PREFIX)/bin/icebox_explain
cp icebox_colbuf.py $(DESTDIR)/bin/icebox_colbuf cp icebox_colbuf.py $(DESTDIR)$(PREFIX)/bin/icebox_colbuf
cp icebox_html.py $(DESTDIR)/bin/icebox_html cp icebox_html.py $(DESTDIR)$(PREFIX)/bin/icebox_html
cp icebox_maps.py $(DESTDIR)/bin/icebox_maps cp icebox_maps.py $(DESTDIR)$(PREFIX)/bin/icebox_maps
cp icebox_vlog.py $(DESTDIR)/bin/icebox_vlog cp icebox_vlog.py $(DESTDIR)$(PREFIX)/bin/icebox_vlog
uninstall: uninstall:
rm -f $(DESTDIR)/bin/icebox.py rm -f $(DESTDIR)$(PREFIX)/bin/icebox.py
rm -f $(DESTDIR)/bin/iceboxdb.py rm -f $(DESTDIR)$(PREFIX)/bin/iceboxdb.py
rm -f $(DESTDIR)/bin/icebox_chipdb rm -f $(DESTDIR)$(PREFIX)/bin/icebox_chipdb
rm -f $(DESTDIR)/bin/icebox_diff rm -f $(DESTDIR)$(PREFIX)/bin/icebox_diff
rm -f $(DESTDIR)/bin/icebox_explain rm -f $(DESTDIR)$(PREFIX)/bin/icebox_explain
rm -f $(DESTDIR)/bin/icebox_colbuf rm -f $(DESTDIR)$(PREFIX)/bin/icebox_colbuf
rm -f $(DESTDIR)/bin/icebox_html rm -f $(DESTDIR)$(PREFIX)/bin/icebox_html
rm -f $(DESTDIR)/bin/icebox_maps rm -f $(DESTDIR)$(PREFIX)/bin/icebox_maps
rm -f $(DESTDIR)/bin/icebox_vlog rm -f $(DESTDIR)$(PREFIX)/bin/icebox_vlog
rm -f $(DESTDIR)/share/icebox/chipdb-1k.txt rm -f $(DESTDIR)$(PREFIX)/share/icebox/chipdb-1k.txt
rm -f $(DESTDIR)/share/icebox/chipdb-8k.txt rm -f $(DESTDIR)$(PREFIX)/share/icebox/chipdb-8k.txt
-rmdir $(DESTDIR)/share/icebox -rmdir $(DESTDIR)$(PREFIX)/share/icebox
.PHONY: all clean install uninstall .PHONY: all clean install uninstall

2
icefuzz/Makefile
View File

@ -1,4 +1,4 @@
include ../config.mk
export LC_ALL=C export LC_ALL=C
TESTS = TESTS =

10
icemulti/Makefile
View File

@ -1,19 +1,17 @@
# CXX = clang include ../config.mk
CXX ?= clang
LDLIBS = -lm -lstdc++ LDLIBS = -lm -lstdc++
CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11
CC = $(CXX)
DESTDIR = /usr/local
all: icemulti all: icemulti
icemulti: icemulti.o icemulti: icemulti.o
install: all install: all
cp icemulti $(DESTDIR)/bin/icemulti mkdir -p $(DESTDIR)$(PREFIX)/bin
cp icemulti $(DESTDIR)$(PREFIX)/bin/icemulti
uninstall: uninstall:
rm -f $(DESTDIR)/bin/icemulti rm -f $(DESTDIR)$(PREFIX)/bin/icemulti
clean: clean:
rm -f icemulti rm -f icemulti

14
icepack/Makefile
View File

@ -1,10 +1,7 @@
# CXX = clang include ../config.mk
CXX ?= clang
LDLIBS = -lm -lstdc++ LDLIBS = -lm -lstdc++
CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include
MXEGCC = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc MXEGCC = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc
CC = $(CXX)
DESTDIR = /usr/local
all: icepack iceunpack all: icepack iceunpack
@ -17,12 +14,13 @@ iceunpack: icepack
ln -sf icepack iceunpack ln -sf icepack iceunpack
install: all install: all
cp icepack $(DESTDIR)/bin/icepack mkdir -p $(DESTDIR)$(PREFIX)/bin
ln -sf icepack $(DESTDIR)/bin/iceunpack cp icepack $(DESTDIR)$(PREFIX)/bin/icepack
ln -sf icepack $(DESTDIR)$(PREFIX)/bin/iceunpack
uninstall: uninstall:
rm -f $(DESTDIR)/bin/icepack rm -f $(DESTDIR)$(PREFIX)/bin/icepack
rm -f $(DESTDIR)/bin/iceunpack rm -f $(DESTDIR)$(PREFIX)/bin/iceunpack
clean: clean:
rm -f icepack rm -f icepack

8
iceprog/Makefile
View File

@ -1,8 +1,7 @@
# CC = clang include ../config.mk
LDLIBS = -L/usr/local/lib -lftdi -lm LDLIBS = -L/usr/local/lib -lftdi -lm
CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
MXEGCC = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc MXEGCC = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc
DESTDIR = /usr/local
all: iceprog all: iceprog
@ -12,10 +11,11 @@ iceprog.exe: iceprog.c
$(MXEGCC) -std=c99 -o iceprog.exe -Os iceprog.c -lftdi -lusb -lm $(MXEGCC) -std=c99 -o iceprog.exe -Os iceprog.c -lftdi -lusb -lm
install: all install: all
cp iceprog $(DESTDIR)/bin/iceprog mkdir -p $(DESTDIR)$(PREFIX)/bin
cp iceprog $(DESTDIR)$(PREFIX)/bin/iceprog
uninstall: uninstall:
rm -f $(DESTDIR)/bin/iceprog rm -f $(DESTDIR)$(PREFIX)/bin/iceprog
clean: clean:
rm -f iceprog rm -f iceprog

8
iceprog/iceprog.c
View File

@ -202,7 +202,7 @@ void flash_64kB_sector_erase(int addr)
{ {
fprintf(stderr, "erase 64kB sector at 0x%06X..\n", addr); fprintf(stderr, "erase 64kB sector at 0x%06X..\n", addr);
uint8_t command[4] = { 0xd8, addr >> 16, addr >> 8, addr }; uint8_t command[4] = { 0xd8, (uint8_t)(addr >> 16), (uint8_t)(addr >> 8), (uint8_t)addr };
set_gpio(0, 0); set_gpio(0, 0);
send_spi(command, 4); send_spi(command, 4);
set_gpio(1, 0); set_gpio(1, 0);
@ -213,7 +213,7 @@ void flash_prog(int addr, uint8_t *data, int n)
if (verbose) if (verbose)
fprintf(stderr, "prog 0x%06X +0x%03X..\n", addr, n); fprintf(stderr, "prog 0x%06X +0x%03X..\n", addr, n);
uint8_t command[4] = { 0x02, addr >> 16, addr >> 8, addr }; uint8_t command[4] = { 0x02, (uint8_t)(addr >> 16), (uint8_t)(addr >> 8), (uint8_t)addr };
set_gpio(0, 0); set_gpio(0, 0);
send_spi(command, 4); send_spi(command, 4);
send_spi(data, n); send_spi(data, n);
@ -229,7 +229,7 @@ void flash_read(int addr, uint8_t *data, int n)
if (verbose) if (verbose)
fprintf(stderr, "read 0x%06X +0x%03X..\n", addr, n); fprintf(stderr, "read 0x%06X +0x%03X..\n", addr, n);
uint8_t command[4] = { 0x03, addr >> 16, addr >> 8, addr }; uint8_t command[4] = { 0x03, (uint8_t)(addr >> 16), (uint8_t)(addr >> 8), (uint8_t)addr };
set_gpio(0, 0); set_gpio(0, 0);
send_spi(command, 4); send_spi(command, 4);
memset(data, 0, n); memset(data, 0, n);
@ -338,7 +338,7 @@ int main(int argc, char **argv)
bool test_mode = false; bool test_mode = false;
const char *filename = NULL; const char *filename = NULL;
const char *devstr = NULL; const char *devstr = NULL;
int ifnum = INTERFACE_A; enum ftdi_interface ifnum = INTERFACE_A;
int opt; int opt;
while ((opt = getopt(argc, argv, "d:I:rRcbnStv")) != -1) while ((opt = getopt(argc, argv, "d:I:rRcbnStv")) != -1)

9
icetime/Makefile
View File

@ -1,18 +1,17 @@
# CXX = clang include ../config.mk
LDLIBS = -lm -lstdc++ LDLIBS = -lm -lstdc++
CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include
CC = $(CXX)
DESTDIR = /usr/local
all: icetime all: icetime
icetime: icetime.o icetime: icetime.o
install: all install: all
cp icetime $(DESTDIR)/bin/icetime mkdir -p $(DESTDIR)$(PREFIX)/bin
cp icetime $(DESTDIR)$(PREFIX)/bin/icetime
uninstall: uninstall:
rm -f $(DESTDIR)/bin/icetime rm -f $(DESTDIR)$(PREFIX)/bin/icetime
# View timing netlist: # View timing netlist: