From 1b114d704f4367bfa1375c1602b4a09c0e771e3c Mon Sep 17 00:00:00 2001 From: Grant Watson Date: Thu, 22 Jul 2021 10:54:13 +0100 Subject: [PATCH] =?UTF-8?q?Docker=20env=20for=20Arm=C2=AE=20Ethos=E2=84=A2?= =?UTF-8?q?-U55=20Port?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Removes /opt/arm/cmake/bin from the path * Parameterizes Arm® Ethos™-U55 driver stack version Change-Id: I2162b40f82241fd013643cbfa8847b60d7f4f5a1 --- docker/Dockerfile.ci_cpu | 2 +- docker/install/ubuntu_install_ethosu_driver_stack.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile.ci_cpu b/docker/Dockerfile.ci_cpu index 65996e13db355..1b276ffd70ddc 100644 --- a/docker/Dockerfile.ci_cpu +++ b/docker/Dockerfile.ci_cpu @@ -118,4 +118,4 @@ COPY install/ubuntu_install_vela.sh /install/ubuntu_install_vela.sh RUN bash /install/ubuntu_install_vela.sh # Update PATH -ENV PATH /opt/arm/bin:/opt/arm/cmake/bin:/opt/arm/gcc-arm-none-eabi/bin:$PATH +ENV PATH /opt/arm/bin:/opt/arm/gcc-arm-none-eabi/bin:$PATH diff --git a/docker/install/ubuntu_install_ethosu_driver_stack.sh b/docker/install/ubuntu_install_ethosu_driver_stack.sh index 7996a25a1eabe..0e96c5e0ee2f7 100755 --- a/docker/install/ubuntu_install_ethosu_driver_stack.sh +++ b/docker/install/ubuntu_install_ethosu_driver_stack.sh @@ -23,6 +23,7 @@ set -o pipefail fvp_dir="/opt/arm/FVP_Corstone_SSE-300_Ethos-U55" cmake_dir="/opt/arm/cmake" ethosu_dir="/opt/arm/ethosu" +ethosu_driver_ver="21.05" mkdir -p /opt/arm @@ -79,15 +80,15 @@ mkdir "${ethosu_dir}" cd "${ethosu_dir}" git clone "https://review.mlplatform.org/ml/ethos-u/ethos-u-core-driver" core_driver cd core_driver -git checkout tags/21.05 +git checkout tags/${ethosu_driver_ver} cd "${ethosu_dir}" git clone "https://review.mlplatform.org/ml/ethos-u/ethos-u-core-platform" core_platform cd core_platform -git checkout tags/21.05 +git checkout tags/${ethosu_driver_ver} # Clone CMSIS cd "${ethosu_dir}" git clone "https://github.com/ARM-software/CMSIS_5.git" cmsis cd cmsis -git checkout -f tags/5.7.0 \ No newline at end of file +git checkout -f tags/5.7.0