Merge pull request #44 from timvideos/travis

Adding base back into Travis-CI
timvideos · Sep 12, 2015 · 21834b4 · 21834b4
2 parents 3cfac03 + 903e99f
commit 21834b4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/.travis-run.sh b/.travis-run.sh
@@ -2,24 +2,27 @@
 
 . scripts/setup-env.sh
 
-set -x
+set +x
+set -e
 
 BOARDS="atlys opsis"
-TARGETS="hdmi2usb"
+TARGETS="base hdmi2usb"
 
 for BOARD in $BOARDS; do
 	for TARGET in $TARGETS; do
-		echo "---------------------------------------------"
+		echo "============================================="
 		echo "- $BOARD $TARGET"
 		echo "---------------------------------------------"
-
 		BOARD=$BOARD TARGET=$TARGET make help
+		echo "---------------------------------------------"
 
 		# FIXME: Add ability to compile gateware.
 
 		BOARD=$BOARD TARGET=$TARGET make lm32-firmware
+		echo "---------------------------------------------"
 		BOARD=$BOARD TARGET=$TARGET make fx2-firmware
-
+		echo "---------------------------------------------"
 		BOARD=$BOARD TARGET=$TARGET make clean
+		echo "============================================="
 	done
 done
diff --git a/Makefile b/Makefile
@@ -36,13 +36,7 @@ help:
 	@echo "   PROG=programmer      (current: $(PROG))"
 	@echo " SERIAL=serial port     (current: $(SERIAL))"
 
-ifeq ($(TARGET), base)
-  GATEWARE_DEP =
-else
-  GATEWARE_DEP = lm32-firmware
-endif
-
-gateware: $(GATEWARE_DEP)
+gateware: lm32-firmware
 	cd $(MSCDIR) && $(CMD) --csr_csv $(HDMI2USBDIR)/test/csr.csv clean
 	cp hdl/encoder/vhdl/header.hex $(MSCDIR)/build/header.hex
 	cd $(MSCDIR) && $(CMD) --csr_csv $(HDMI2USBDIR)/test/csr.csv build-csr-csv build-bitstream
@@ -53,9 +47,16 @@ load-gateware:
 release-gateware:
 	cd $(MSCDIR)/build && tar -cvzf ../$(HDMI2USBDIR)/$(BOARD)_$(TARGET)_gateware_$(DATE).tar.gz *.bin *.bit
 
+
+ifeq ($(TARGET), base)
+lm32-firmware:
+	cd $(MSCDIR) && $(CMD) build-headers
+	echo "No lm32-firmware for base target."
+else
 lm32-firmware:
 	cd $(MSCDIR) && $(CMD) build-headers
 	$(MAKE) -C firmware/lm32 all
+endif
 
 load-lm32-firmware: lm32-firmware
 	$(FLTERM) --port $(SERIAL) --kernel=firmware/lm32/firmware.bin --kernel-adr=0x20000000 --speed 115200