Merge branch 'develop' into feature/NewRuntime

wirthjohannes · Oct 19, 2020 · e7f45e1 · e7f45e1
2 parents 281f19b + 3294859
commit e7f45e1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ To use TaPaSCo, you'll need working installations of
 *   Vivado Design Suite 2017.4 or newer
 *   Java SDK 8 - 11
 *   git
-*   python
+*   python3
 *   GCC newer than 5.x.x for C++11 support
 *   *OPTIONAL:* Local Installation of gradle 5.0+, if you do not want to use the included wrapper.
 
@@ -112,12 +112,12 @@ Prerequisites for compiling the runtime
 
 *Ubuntu*:
 ```
-apt-get -y install build-essential linux-headers-generic python cmake libelf-dev git rpm
+apt-get -y install build-essential linux-headers-generic python3 cmake libelf-dev git rpm
 ```
 
 *Fedora*:
 ```
-dnf -y install kernel-devel make gcc gcc-c++ elfutils-libelf-devel cmake python libatomic git rpm-build
+dnf -y install kernel-devel make gcc gcc-c++ elfutils-libelf-devel cmake python3 libatomic git rpm-build
 ```
 
 *Rust*:

diff --git a/tapasco-init.sh b/tapasco-init.sh
@@ -44,12 +44,12 @@ else
 
     echo "if echo \"\${PATH}\" | grep --quiet \"cmake-3.3.2\";" >> tapasco-setup.sh
     echo "then" >> tapasco-setup.sh
-    echo "    if ! command -v python > /dev/null;" >> tapasco-setup.sh
+    echo "    if ! command -v python3 > /dev/null;" >> tapasco-setup.sh
     echo "    then" >> tapasco-setup.sh
-    echo "        echo \"Could not remove old CMake version from Path. Please install python\"" >> tapasco-setup.sh
+    echo "        echo \"Could not remove old CMake version from Path. Please install python3\"" >> tapasco-setup.sh
     echo "    else" >> tapasco-setup.sh
     echo "        echo \"Removing old CMake version 3.3.2 distributed with Vivado from Path\"" >> tapasco-setup.sh
-    echo "        export PATH=\`python -c \"import re; print(re.sub(r'[:][^:]*?cmake[-]3[.]3[.]2.*?[:]', ':', '\${PATH}'));\"\`" >> tapasco-setup.sh
+    echo "        export PATH=\`python3 -c \"import re; print(re.sub(r'[:][^:]*?cmake[-]3[.]3[.]2.*?[:]', ':', '\${PATH}'));\"\`" >> tapasco-setup.sh
     echo "    fi" >> tapasco-setup.sh
     echo "fi" >> tapasco-setup.sh
 

diff --git a/toolflow/vivado/platform/zynqmp/buildLibs.py b/toolflow/vivado/platform/zynqmp/buildLibs.py
diff --git a/toolflow/vivado/platform/zynqmp/interrupts.dtsi b/toolflow/vivado/platform/zynqmp/interrupts.dtsi