From 79b8d8006e1e181bdc7b6db60d4732a55173c8b9 Mon Sep 17 00:00:00 2001
From: dwn1c21 <d.newbrook@soton.ac.uk>
Date: Mon, 15 May 2023 13:07:09 +0000
Subject: [PATCH] Remove arm ip directory untar etc.
---
.gitlab-ci.yml | 24 ++----------------------
1 file changed, 2 insertions(+), 22 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5718aa..088c19d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,14 +35,6 @@ build-job-Z2: # This job runs in the build stage, which runs first.
script:
# setup vivado environment for Vivado 2021.1
- source /tools/Xilinx/Vivado/2021.1/.settings64-Vivado.sh
- # move and unpack the arm ip into the arm-AAA-ip folder, below the working directory
- - cp -r /home/gitlab-runner/arm-AAA-ip ../arm-AAA-ip
- - cd ../arm-AAA-ip/Corstone-101_Foundation_IP/
- - tar -xf BP210-r1p1-00rel0.tar.gz
- - cd ../Cortex-M0/
- - tar -xf AT510-r0p0-03rel2.tar.gz
- - cd ../DMA-230_MicroDMA_Controller/
- - tar -xf PL230-r0p0-02rel2-1.tar.gz
# move to fpga_imp directory and run the fpga build script for pynq z2
- cd ../../nanosoc_tech/system/fpga_imp/
- source ../../set_env.sh
@@ -56,9 +48,6 @@ build-job-Z2: # This job runs in the build stage, which runs first.
- echo "Build failed"
- exit 1
- fi
- # cleanup arm-AAA-ip directory
- - cd ../../../
- - rm -r arm-AAA-ip
artifacts:
paths:
# Keep the generated bit and hwh file from fpga build script
@@ -71,14 +60,8 @@ build-job-Z2: # This job runs in the build stage, which runs first.
build-job-ZCU104: # This job runs in the build stage, which runs first.
stage: build
script:
- # move and unpack the arm ip into the arm-AAA-ip folder, below the working directory
- - cp -r /home/dwn1c21/arm-AAA-ip ../arm-AAA-ip
- - cd ../arm-AAA-ip/Corstone-101_Foundation_IP/
- - tar -xf BP210-r1p1-00rel0.tar.gz
- - cd ../Cortex-M0/
- - tar -xf AT510-r0p0-03rel2.tar.gz
- - cd ../DMA-230_MicroDMA_Controller/
- - tar -xf PL230-r0p0-02rel2-1.tar.gz
+ # setup vivado environment for Vivado 2021.1
+ - source /tools/Xilinx/Vivado/2021.1/.settings64-Vivado.sh
# move to fpga_imp directory and run the fpga build script for pynq z2
- cd ../../nanosoc_tech/system/fpga_imp/
- source ../../set_env.sh
@@ -92,9 +75,6 @@ build-job-ZCU104: # This job runs in the build stage, which runs first.
- echo "Build failed"
- exit 1
- fi
- # cleanup arm-AAA-ip directory
- - cd ../../../
- - rm -r arm-AAA-ip
artifacts:
paths:
# Keep the generated bit and hwh file from fpga build script
--
GitLab