Merge pull request #329 from mithro/litex-update

Update third_party modules.
timvideos · Jul 22, 2017 · 64972e6 · 64972e6
2 parents bc835e3 + bcedb07
commit 64972e6
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,12 +33,12 @@ env:
 #   - PLATFORM=netv2
 #   - PLATFORM=nexys_video
 #   - PLATFORM=pipistrello
-   - CPU=lm32 PLATFORM=opsis SKIP_TARGETS="hdmi2usb\|video.*"
+   - CPU=lm32 PLATFORM=opsis SKIP_TARGETS="hdmi2usb\|video.*\|memtest"
    - CPU=or1k PLATFORM=opsis TARGETS="base net"
    - PLATFORM=opsis TARGET=video
    - PLATFORM=opsis TARGET=hdmi2usb
 #   - PLATFORM=sim
-   - CPU=lm32 PLATFORM=mimasv2
+   - CPU=lm32 PLATFORM=mimasv2 TARGETS="base"
    - CPU=or1k PLATFORM=mimasv2 TARGETS="base" # or1k and memtest don't fit on mimasv2
 
 install:

diff --git a/third_party/litedram b/third_party/litedram
diff --git a/third_party/liteeth b/third_party/liteeth
diff --git a/third_party/litepcie b/third_party/litepcie
diff --git a/third_party/litesata b/third_party/litesata
diff --git a/third_party/litescope b/third_party/litescope
diff --git a/third_party/liteusb b/third_party/liteusb
diff --git a/third_party/litevideo b/third_party/litevideo
diff --git a/third_party/litex b/third_party/litex
diff --git a/third_party/merge-upstream.sh b/third_party/merge-upstream.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-TARGETS=${@-$(find * -maxdepth 0 -type d | grep -v micropython | grep -v qemu)}
+TARGETS=${@-$(find * -maxdepth 0 -type d | grep -v micropython | grep -v qemu | grep -v libuip)}
 
 COMMIT_MSG=$(tempfile) || exit
 trap "rm -f -- '$COMMIT_MSG'" EXIT