Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

`icemulti' improvements #90

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open

`icemulti' improvements #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
379902f
Add target `check'
rlutz Jul 11, 2017
c0ae9f8
icebram: Skip test if required tools aren't in PATH
rlutz Jul 11, 2017
e2b5645
icemulti: Add tests
rlutz Aug 14, 2017
9d46551
icemulti: Use standard macros for exit status
rlutz Jul 10, 2017
10f31ae
icemulti: Use standard error handling functions
rlutz Jul 10, 2017
daf80c7
icemulti: Give more information about I/O errors
rlutz Jul 10, 2017
34dbf88
icemulti: Add missing error checks
rlutz Jul 10, 2017
54c33eb
icemulti: Refuse to pack empty image
rlutz Aug 14, 2017
69b4171
icemulti: Use getopt to parse arguments
rlutz Jul 10, 2017
49c6103
icemulti: Check for negative alignment exponent
rlutz Jul 11, 2017
07d3b40
icemulti: Add option `--help'
rlutz Jul 10, 2017
510a163
icemulti: Overhaul `--help' text
rlutz Jul 10, 2017
738e3ae
icemulti: Treat coldboot as global flag
rlutz Jul 11, 2017
ef31868
icemulti: Remove unused flag Header::empty
rlutz Jul 11, 2017
2a3403d
icemulti: Store image reference in header
rlutz Jul 11, 2017
0dda53c
icemulti: Make function `write_header' global
rlutz Jul 11, 2017
9bcf6db
icemulti: Remove class `Header'
rlutz Jul 11, 2017
5c15c93
icemulti: Populate headers early
rlutz Jul 11, 2017
fa32bae
icemulti: Differentiate between header and image count
rlutz Jul 11, 2017
871389f
icemulti: Remove special first element from header lists
rlutz Jul 11, 2017
c957e59
icemulti: Remove constant `NUM_HEADERS'
rlutz Jul 11, 2017
fad345a
icemulti: Remove unnecessary generalization of offset printing
rlutz Aug 14, 2017
4a60dfd
icemulti: Print image filenames along with offsets
rlutz Aug 14, 2017
d742375
icemulti: Re-use images
rlutz Jul 11, 2017
ffeaedf
icemulti: Allow selecting default image
rlutz Jul 16, 2017
1de5f58
icemulti: Allow using `-p' with `-c' (but issue a warning)
rlutz Aug 14, 2017
5878b1d
icemulti: Move image loading to separate function
rlutz Jul 16, 2017
d1e002b
icemulti: Use plain references for image array
rlutz Aug 15, 2017
8667cf6
icemulti: Skip unused header population
rlutz Jul 16, 2017
f69bd9b
icemulti: Store POR/default image in dedicated variables
rlutz Aug 15, 2017
fd567c9
icemulti: Pack power-on/reset image first
rlutz Aug 14, 2017
8c820d0
icemulti: Allow selecting POR/default image by filename
rlutz Aug 15, 2017
77f6616
icemulti: Add myself to copyright notice
rlutz Aug 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include config.mk

SUBDIRS = icebox icepack iceprog icemulti icepll icetime icebram

all clean install uninstall:
all check clean install uninstall:
for dir in $(SUBDIRS); do \
$(MAKE) -C $$dir $@ || exit; \
done
Expand All @@ -14,5 +14,5 @@ mxebin: clean
cp icemulti/*.exe icepll/*.exe icetime/*.exe icestorm-win32/
zip -r icestorm-win32.zip icestorm-win32/

.PHONY: all clean install uninstall
.PHONY: all check clean install uninstall

4 changes: 3 additions & 1 deletion icebox/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ chipdb-8k.txt: icebox.py iceboxdb.py icebox_chipdb.py
python3 icebox_chipdb.py -8 > chipdb-8k.new
mv chipdb-8k.new chipdb-8k.txt

check: all

clean:
rm -f chipdb-1k.txt chipdb-8k.txt chipdb-384.txt chipdb-5k.txt
rm -f icebox.pyc iceboxdb.pyc
Expand Down Expand Up @@ -55,4 +57,4 @@ uninstall:
rm -f $(DESTDIR)$(PREFIX)/share/icebox/chipdb-8k.txt
-rmdir $(DESTDIR)$(PREFIX)/share/icebox

.PHONY: all clean install uninstall
.PHONY: all check clean install uninstall
14 changes: 11 additions & 3 deletions icebram/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,16 @@ all: icebram$(EXE)
icebram$(EXE): icebram.o
$(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS)

test: icebram
bash rundemo.sh
check test: all
@if type yosys; then \
if type arachne-pnr; then \
if type iverilog; then \
if type vvp; then \
bash rundemo.sh; \
else echo "... skipping icebram test ..."; fi; \
else echo "... skipping icebram test ..."; fi; \
else echo "... skipping icebram test ..."; fi; \
else echo "... skipping icebram test ..."; fi

install: all
mkdir -p $(DESTDIR)$(PREFIX)/bin
Expand All @@ -27,5 +35,5 @@ clean:

-include *.d

.PHONY: all test install uninstall clean
.PHONY: all check test install uninstall clean

5 changes: 4 additions & 1 deletion icemulti/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ all: icemulti$(EXE)
icemulti$(EXE): icemulti.o
$(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS)

check: all
cd tests; ./run-tests

install: all
mkdir -p $(DESTDIR)$(PREFIX)/bin
cp icemulti$(EXE) $(DESTDIR)$(PREFIX)/bin/icemulti$(EXE)
Expand All @@ -23,5 +26,5 @@ clean:

-include *.d

.PHONY: all install uninstall clean
.PHONY: all check install uninstall clean

Loading