Merge branch 'upstream' into xfer-fw

.github/autolabeler.yml

@@ -0,0 +1,43 @@
+board-arty: ["targets/arty", "platforms/arty.py"]
+board-atlys: ["targets/atlys", "platforms/atlys.py"]
+board-basys3: ["targets/basys3", "platforms/basys3.py"]
+board-cmod_a7: ["targets/cmod_a7", "platforms/cmod_a7.py"]
+board-galatea: ["targets/galatea", "platforms/galatea.py"]
+board-mimasv2: ["targets/mimasv2", "platforms/mimasv2.py"]
+board-minispartan6: ["targets/minispartan6", "platforms/minispartan6.py"]
+board-neso: ["targets/neso", "platforms/neso.py"]
+board-netv2: ["targets/netv2", "platforms/netv2.py"]
+board-nexys-video: ["targets/nexys-video", "platforms/nexys-video.py"]
+board-opsis: ["targets/opsis", "platforms/opsis.py", "platforms/tofe_*.py"]
+board-pipistrello: ["targets/pipistrello", "platforms/pipistrello.py"]
+board-saturn: ["targets/saturn", "platforms/saturn.py"]
+board-sim: ["targets/sim", "platforms/sim.py"]
+board-waxwing: ["targets/waxwing", "platforms/waxwing.py"]
+boards-all: ["targets/common/"]
+boards-artix7: [
+        "targets/arty", "platforms/arty.py",
+        "targets/basys3", "platforms/basys3.py",
+        "targets/cmod_a7", "platforms/cmod_a7.py",
+        "targets/neso", "platforms/neso.py",
+        "targets/netv2", "platforms/netv2.py",
+        "targets/nexys-video", "platforms/nexys-video.py"
+        ]
+boards-spartan6: [
+        "targets/atlys", "platforms/atlys.py",
+        "targets/galatea", "platforms/galatea.py",
+        "targets/mimasv2", "platforms/mimasv2.py",
+        "targets/minispartan6", "platforms/minispartan6.py",
+        "targets/opsis", "platforms/opsis.py",
+        "targets/pipstrello", "platforms/pipstrello.py",
+        "targets/saturn", "platforms/saturn.py",
+        "targets/waxwing", "platforms/waxwing.py"
+        ]
+firmware-fpga: ["gateware/"]
+firmware-softcpu: ["firmware/"]
+hdmi2ethernet: ["targets/*/net.py", "targets/*/hdmi2eth.py", "firmware/uip/", "third_party/libuip/"]
+hdmi2usb: ["targets/*/hdmi2usb.py", "gateware/encoder/"]
+hdmi2***: ["targets/*/base.py"]
+level-docs: ["docs/", "README.md", "*.md"]
+level-firmware: ["gateware/", "firmware/"]
+level-infrastructure: [".travis.yml", ".travis/", "scripts/", ".github/"]
+level-software: ["software/"]

.gitignore

@@ -2,9 +2,12 @@ __pycache__
 *.pyc
 *.egg-info
 *.vcd
+firmware/hdmi_in[1-9].[ch]
 outgoing
 build
 *~
 *.png
 third_party/qemu-litex
 third_party/micropython
+third_party/linux
+third_party/litex-devicetree

.gitmodules

@@ -31,3 +31,6 @@
 [submodule "third_party/libmodem"]
 	path = third_party/libmodem
 	url = https://github.com/cr1901/libmodem
+[submodule "third_party/migen"]
+	path = third_party/migen
+	url = https://github.com/m-labs/migen.git

.travis.yml

@@ -7,6 +7,7 @@ compiler:
 sudo: false
 addons:
   apt:
+    update: true
     packages:
     - build-essential
     - fxload
@@ -26,6 +27,10 @@ env:
   global:
    - HDMI2USB_UDEV_IGNORE=1
    - CLEAN_CHECK=1
+   - PREBUILT_DIR="/tmp/HDMI2USB-firmware-prebuilt"
+   # Travis reports incorrect the hosts number of processors, override to 2
+   # cores.
+   - JOBS=2
 
 before_install:
  - wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip -O /tmp/ninja.zip
@@ -34,14 +39,18 @@ before_install:
  - pip3 install --user meson
 
 install:
- - export CPU="$C"
- - export PLATFORMS="$P"
- - export TARGETS="$T"
+ - export CPUS="$C" && echo "CPUS='$CPUS'"
+ - export PLATFORMS="$P" && echo "PLATFORMS='$PLATFORMS'"
+ - export TARGETS="$T" && echo "TARGETS='$TARGETS'"
+ - export FIRMWARE="$F" && echo "FIRMWARE='$FIRMWARE'"
  - $PWD/.travis/setup.sh
 
 script:
  - $PWD/.travis/build.sh
 
+after_success:
+ - $PWD/.travis/update-prebuilt-list.sh
+
 notifications:
  email:
   - [email protected]
@@ -85,6 +94,24 @@ jobs:
   - stage: Targets - Base
     env: C=lm32 P=pipistrello  T="base"
 
+  - stage: Targets - Base
+    env: C=lm32 P=saturn       T="base"
+
+  - stage: Targets - Base
+    env: C=lm32 P=galatea      T="base"
+
+  - stage: Targets - Base
+    env: C=lm32 P=neso         T="base"
+
+  - stage: Targets - Base
+    env: C=lm32 P=waxwing      T="base"
+
+  - stage: Targets - Base
+    env: C=lm32 P=basys3       T="base"
+
+  - stage: Targets - Base
+    env: C=lm32 P=cmod_a7      T="base"
+
   # or1k base targets
   - stage: Targets - Base
     env: C=or1k P=arty         T="base net"
@@ -101,14 +128,19 @@ jobs:
   - stage: Targets - Base
     env: C=or1k P=pipistrello  T="base"
 
+  # Linux Targets
+  #--------------------------------------------
+  - stage: Targets - Base
+    env: C=or1k.linux F=linux P=arty        T="net"
+
   #--------------------------------------------
   # Video Targets
   #--------------------------------------------
   - stage: Targets - Video
     env: C=lm32 P=atlys        T="video"
 
-  - stage: Targets - Video
-    env: C=lm32 P=netv2        T="video"
+  #- stage: Targets - Video
+  #  env: C=lm32 P=netv2        T="video"
 
   - stage: Targets - Video
     env: C=lm32 P=nexys_video  T="video"

.travis/add-local-submodule.sh

@@ -17,7 +17,7 @@ USER_SLUG="$1"
 SUBMODULE="$2"
 REV=$(git rev-parse HEAD)
 
-echo "Submodule $SUBMODULE @ $REV"
+echo "Submodule $SUBMODULE"
 
 # Get the pull request info
 REQUEST_USER="$(echo $USER_SLUG | perl -pe 's|^([^/]*)/.*|\1|')"
@@ -27,16 +27,16 @@ echo "Request user is '$REQUEST_USER'".
 echo "Request repo is '$REQUEST_REPO'".
 
 # Get current origin from git
-ORIGIN="$(git config -f .gitmodules submodule.$SUBMODULE.url)"
-#ORIGIN="$(git remote get-url origin)"
-if echo $ORIGIN | grep -q "github.com"; then
+ORIGIN_URL="$(git config -f .gitmodules submodule.$SUBMODULE.url)"
+#ORIGIN_URL="$(git remote get-url origin)"
+if echo $ORIGIN_URL | grep -q "github.com"; then
 	echo "Found github"
 else
 	echo "Did not find github, skipping"
 	exit 0
 fi
 
-ORIGIN_SLUG=$(echo $ORIGIN | perl -pe 's|.*github.com/(.*?)(.git)?$|\1|')
+ORIGIN_SLUG=$(echo $ORIGIN_URL | perl -pe 's|.*github.com/(.*?)(.git)?$|\1|')
 echo "Origin slug is '$ORIGIN_SLUG'"
 
 ORIGIN_USER="$(echo $ORIGIN_SLUG | perl -pe 's|^([^/]*)/.*|\1|')"
@@ -47,26 +47,36 @@ echo "Origin repo is '$ORIGIN_REPO'"
 
 USER_URL="git://github.com/$REQUEST_USER/$ORIGIN_REPO.git"
 
-echo "Users repo would be '$USER_URL'"
+# Check if the user's repo exists
+echo -n "User's repo would be '$USER_URL' "
+if git ls-remote --exit-code --heads "$USER_URL" > /dev/null 2>&1; then
+	echo "which exists!"
+else
+	echo "which does *not* exist!"
+	USER_URL="$ORIGIN_URL"
+fi
 
+# If submodule doesn't exist, clone directly from the users repo
 if [ ! -e $SUBMODULE/.git ]; then
-	echo "Successfully cloned from user repo '$USER_URL'"
-	$(which git) clone $USER_URL $SUBMODULE --origin user || true
-	if [ -d $SUBMODULE/.git ]; then
-		echo "Successfully cloned from user repo '$ORIGIN_REPO'"
-	fi
-fi
-if [ -e $SUBMODULE/.git ]; then
-	(
-		cd $SUBMODULE
-		git remote add user $USER_URL || git remote set-url user $USER_URL
-		$(which git) fetch user || git remote rm user
-
-		git remote add origin $ORIGIN || git remote set-url origin $ORIGIN
-		$(which git) fetch origin
-	)
+	echo "Cloning '$ORIGIN_REPO' from repo '$USER_URL'"
+	git clone $USER_URL $SUBMODULE --origin user
 fi
+# If the submodule does exist, add a new remote.
+(
+	cd $SUBMODULE
+
+	git remote rm user >/dev/null 2>&1 || true
+	if [ "$USER_URL" != "$ORIGIN_URL" ]; then
+		git remote add user $USER_URL
+		git fetch user
+	fi
+
+	git remote rm origin >/dev/null 2>&1 || true
+	git remote add origin $ORIGIN_URL
+	git fetch origin
+)
 
+# Checkout the submodule at the right revision
 git submodule update --init $SUBMODULE
 
 # Call ourselves recursively.