Skip to content

Bunch of small travis fixes #254

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

Merged
merged 4 commits into from
Apr 16, 2016
Merged

Bunch of small travis fixes #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c93bb43
travis: Enabling the video targets.
mithro Apr 15, 2016
de58e05
travis: Updating the run script.
mithro Apr 14, 2016
3e596c7
travis: Remove obsolete FPGALink reference.
mithro Apr 14, 2016
0592eb5
Makefiles: Disable parallel builds.
mithro Apr 16, 2016
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
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ addons:
env:
matrix:
- BOARD=atlys TARGET=base
- BOARD=atlys TARGET=video
- BOARD=atlys TARGET=hdmi2usb
- BOARD=atlys TARGET=hdmi2eth
- BOARD=opsis TARGET=base
- BOARD=opsis TARGET=video
- BOARD=opsis TARGET=hdmi2usb
- BOARD=pipistrello TARGET=base

Expand Down
1 change: 0 additions & 1 deletion .travis/package-xilinx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export PREFIX="/opt/Xilinx/"
# This is based on https://github.com/m-labs/migen/blob/master/tools/strace_tailor.sh
STRACE_LOG=$BASE/strace.log
if [ ! -f $STRACE_LOG ]; then
export PROGS=fpgalink
strace -e trace=file,process -f -o ${STRACE_LOG} bash $SETUP_DIR/run.sh
fi

Expand Down
9 changes: 2 additions & 7 deletions .travis/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ set +x
set -e

if [ -z "$BOARD" ]; then
BOARDS="atlys opsis"
BOARDS=$(ls targets/${BOARD}_* | sed -e"s+targets/${BOARD}_++" -e"s/.py//")
else
BOARDS="$BOARD"
fi
Expand All @@ -23,12 +23,7 @@ find | sort > /tmp/filelist.before

for BOARD in $BOARDS; do
if [ -z "$TARGET" ]; then
TARGETS="base hdmi2usb"
# FIXME: Get hdmi2eth working on the Opsis
# https://github.com/timvideos/HDMI2USB-misoc-firmware/issues/51
if [ "$BOARD" = "atlys" ]; then
TARGETS="$TARGETS hdmi2eth"
fi
TARGETS=$(ls targets/${BOARD}_* | sed -e"s+targets/${BOARD}_++" -e"s/.py//")
else
TARGETS="$TARGET"
fi
Expand Down
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,5 +163,7 @@ clean:
rm -f third_party/misoc/build/*.bit
rm -f firmware/fx2/hdmi2usb.hex


.DEFAULT_GOAL := help
.PHONY: all load-gateware load flash gateware gateware-submodules gateware-generate gateware-build firmware download-prebuilt third_party/*
.NOTPARALLEL: *
.PHONY: help all third_party/* gateware-submodules gateware-generate gateware-build gateware firmware download-prebuilt test