Merge pull request #323 from mithro/master

Small fixes

.travis.yml

@@ -25,20 +25,21 @@ env:
    - CLEAN_CHECK=1
   matrix:
 #   - PLATFORM=arty
-   - PLATFORM=atlys SKIP_TARGETS="hdmi2usb\|video.*"
+   - CPU=lm32 PLATFORM=atlys SKIP_TARGETS="hdmi2usb\|video.*"
+   - CPU=or1k PLATFORM=atlys SKIP_TARGETS="hdmi2usb\|video.*"
    - PLATFORM=atlys TARGET=video
    - PLATFORM=atlys TARGET=hdmi2usb
    - PLATFORM=minispartan6
 #   - PLATFORM=netv2
 #   - PLATFORM=nexys_video
 #   - PLATFORM=pipistrello
-   - PLATFORM=opsis SKIP_TARGETS="hdmi2usb\|video.*"
+   - CPU=lm32 PLATFORM=opsis SKIP_TARGETS="hdmi2usb\|video.*"
+   - CPU=or1k PLATFORM=opsis SKIP_TARGETS="hdmi2usb\|video.*"
    - PLATFORM=opsis TARGET=video
    - PLATFORM=opsis TARGET=hdmi2usb
 #   - PLATFORM=sim
-   # Test multiple CPU archs on the mimasv2
    - CPU=lm32 PLATFORM=mimasv2
-   - CPU=or1k PLATFORM=mimasv2 SKIP_TARGETS="memtest"
+   - CPU=or1k PLATFORM=mimasv2 SKIP_TARGETS="memtest" # or1k and memtest don't fit on mimasv2
 
 install:
  - $PWD/.travis/setup.sh

scripts/download-env.sh

@@ -226,8 +226,8 @@ check_version ${CPU}-elf-gcc $GCC_VERSION
 # openocd for programming via Cypress FX2
 echo
 echo "Installing openocd (jtag tool for programming and debug)"
-conda install openocd
-check_version openocd 0.10.0-dev
+conda install openocd=$OPENOCD_VERSION
+check_version openocd $OPENOCD_VERSION
 
 echo ""
 echo "Installing Python modules into environment"

scripts/enter-env.sh

@@ -208,7 +208,7 @@ check_version ${CPU}-elf-gcc $GCC_VERSION || return 1
 
 
 
-check_version openocd 0.10.0-dev || return 1
+check_version openocd $OPENOCD_VERSION || return 1
 
 echo ""
 echo "Checking Python modules in environment"

scripts/settings.sh

@@ -17,7 +17,7 @@ HEXFILE_VERSION=0.1
 BINUTILS_VERSION=2.28
 GCC_VERSION=5.4.0
 SDCC_VERSION=3.5.0
-OPENOCD_VERSION=0.10.0-dev
+OPENOCD_VERSION=0.10.0
 
 # lite modules
 LITE_REPOS="