From 91ce5d7d85e099cdaf3194a97795c439c27fdd1c Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Fri, 26 May 2023 10:59:01 +0100
Subject: [PATCH] SOC1-223: Update enviroment variable names
---
.gitlab-ci.yml | 4 ++--
set_env.sh | 8 ++++----
system/aes/aes128_tests/makefile | 2 +-
system/makefile | 16 ++++++++--------
system/src/nanosoc_ahb_busmatrix/makefile | 2 +-
system/testcodes/aes128_tests/makefile | 2 +-
system/testcodes/apb_mux_tests/makefile | 2 +-
system/testcodes/bootloader/makefile | 2 +-
system/testcodes/debug_tests/makefile | 2 +-
system/testcodes/default_slaves_tests/makefile | 2 +-
system/testcodes/defs.makefile | 2 +-
system/testcodes/dhry/makefile | 2 +-
system/testcodes/dma_tests/makefile | 2 +-
system/testcodes/dualtimer_demo/makefile | 2 +-
system/testcodes/gpio_driver_tests/makefile | 2 +-
system/testcodes/gpio_tests/makefile | 2 +-
system/testcodes/hello/makefile | 2 +-
system/testcodes/interrupt_demo/makefile | 2 +-
system/testcodes/memory_tests/makefile | 2 +-
system/testcodes/romtable_tests/makefile | 2 +-
system/testcodes/self_reset_demo/makefile | 2 +-
system/testcodes/sleep_demo/makefile | 2 +-
system/testcodes/timer_driver_tests/makefile | 2 +-
system/testcodes/timer_tests/makefile | 2 +-
system/testcodes/uart_driver_tests/makefile | 2 +-
system/testcodes/uart_tests/makefile | 2 +-
system/testcodes/watchdog_demo/makefile | 2 +-
27 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c29e5e3..f57d177 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,8 +26,8 @@ compile-bootrom:
stage: compile
script:
- source ./set_env.sh
- - mkdir -p $NANOSOC_TECH_DIR/system/src/bootrom
- - make -C $NANOSOC_TECH_DIR/system bootrom SIM_TOP_DIR=$NANOSOC_TECH_DIR/sim BOOTROM_BUILD_DIR=$NANOSOC_TECH_DIR/system/src/bootrom TOOL_CHAIN=ds5
+ - mkdir -p $SOCLABS_NANOSOC_TECH_DIR/system/src/bootrom
+ - make -C $SOCLABS_NANOSOC_TECH_DIR/system bootrom SIM_TOP_DIR=$SOCLABS_NANOSOC_TECH_DIR/sim BOOTROM_BUILD_DIR=$SOCLABS_NANOSOC_TECH_DIR/system/src/bootrom TOOL_CHAIN=ds5
artifacts:
paths:
- ./sim/bootloader/bootloader.hex
diff --git a/set_env.sh b/set_env.sh
index 619fe21..cb5f6b6 100755
--- a/set_env.sh
+++ b/set_env.sh
@@ -10,8 +10,8 @@
#-----------------------------------------------------------------------------
#!/bin/bash
-# Set NANOSOC_TECH_DIR environment variable
-if [ -z $NANOSOC_TECH_DIR ]; then
- # If $NANOSOC_TECH_DIRN_ROOT hasn't been set yet
- export NANOSOC_TECH_DIR=`git rev-parse --show-toplevel`
+# Set SOCLABS_NANOSOC_TECH_DIR environment variable
+if [ -z $SOCLABS_NANOSOC_TECH_DIR ]; then
+ # If $SOCLABS_NANOSOC_TECH_DIRN_ROOT hasn't been set yet
+ export SOCLABS_NANOSOC_TECH_DIR=`git rev-parse --show-toplevel`
fi
\ No newline at end of file
diff --git a/system/aes/aes128_tests/makefile b/system/aes/aes128_tests/makefile
index 390704d..7bd7973 100644
--- a/system/aes/aes128_tests/makefile
+++ b/system/aes/aes128_tests/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/makefile b/system/makefile
index f0a782e..f426e6b 100644
--- a/system/makefile
+++ b/system/makefile
@@ -38,15 +38,15 @@
# Configurations
# Directory of Testcodes
-NANOSOC_SYSTEM_DIR ?= $(NANOSOC_TECH_DIR)/system
-NANOSOC_SW_DIR ?= $(NANOSOC_TECH_DIR)/software
+NANOSOC_SYSTEM_DIR ?= $(SOCLABS_NANOSOC_TECH_DIR)/system
+NANOSOC_SW_DIR ?= $(SOCLABS_NANOSOC_TECH_DIR)/software
NANOSOC_HTML_DIR := $(NANOSOC_SYSTEM_DIR)/html
VERILOG_DIR := $(NANOSOC_SYSTEM_DIR)/verilog
TESTCODES_DIR := $(NANOSOC_SYSTEM_DIR)/testcodes
# Project System Directory
-PROJ_SYS_DIR := $(PROJECT_DIR)/system
+PROJ_SYS_DIR := $(SOCLABS_PROJECT_DIR)/system
PROJ_SW_DIR ?= $(PROJ_SYS_DIR)/cpu_software
# Name of test directory (e.g. hello, dhry)
@@ -77,8 +77,8 @@ ADP_OPTIONS := -define ADP_FILE=\"$(ADP_PATH)\"
# Boot Loader image
BOOTLOADER ?= bootloader
BOOTROM_ADDRW ?= 8
-BOOTROM_HEX ?= $(NANOSOC_TECH_DIR)/system/testcodes/bootloader/$(BOOTLOADER).hex
-BOOTROM_BUILD_DIR ?= $(PROJECT_DIR)/system/src/bootrom
+BOOTROM_HEX ?= $(SOCLABS_NANOSOC_TECH_DIR)/system/testcodes/bootloader/$(BOOTLOADER).hex
+BOOTROM_BUILD_DIR ?= $(SOCLABS_PROJECT_DIR)/system/src/bootrom
NANOSOC_EXPANSION_REGION ?= yes
@@ -91,14 +91,14 @@ ifeq ($(NANOSOC_EXPANSION_REGION),yes)
endif
# Simulator Command file to specify RTL source files
-TBENCH_VC ?= $(PROJECT_DIR)/flist/project/system.flist
+TBENCH_VC ?= $(SOCLABS_PROJECT_DIR)/flist/project/system.flist
# Simulator type (mti/vcs/xm)
SIMULATOR = mti
# Directory to put simulation files
-SIM_TOP_DIR ?= $(PROJECT_DIR)/simulate/sim
+SIM_TOP_DIR ?= $(SOCLABS_PROJECT_DIR)/simulate/sim
SIM_DIR = $(SIM_TOP_DIR)/$(TESTNAME)
@@ -443,7 +443,7 @@ clean_code:
# ----- verification ------
verify:
- @python3 $(PROJECT_DIR)/flow/adp_verify.py
+ @python3 $(SOCLABS_PROJECT_DIR)/flow/adp_verify.py
# ------- clean -----------
diff --git a/system/src/nanosoc_ahb_busmatrix/makefile b/system/src/nanosoc_ahb_busmatrix/makefile
index 2412557..5d6a83e 100644
--- a/system/src/nanosoc_ahb_busmatrix/makefile
+++ b/system/src/nanosoc_ahb_busmatrix/makefile
@@ -15,7 +15,7 @@
MATRIX_NAME ?= nanosoc_ahb32_4x7
# Top-level directory of Bus Matrix
-BUILD_DIR ?= $(NANOSOC_TECH_DIR)/system/src/nanosoc_ahb_busmatrix
+BUILD_DIR ?= $(SOCLABS_NANOSOC_TECH_DIR)/system/src/nanosoc_ahb_busmatrix
# Directory location of BuildBusMatrix Script
SOURCE_DIR = $(ARM_IP_LIBRARY_PATH)/latest/Corstone-101/logical/cmsdk_ahb_busmatrix
diff --git a/system/testcodes/aes128_tests/makefile b/system/testcodes/aes128_tests/makefile
index 965b6ef..70938b9 100644
--- a/system/testcodes/aes128_tests/makefile
+++ b/system/testcodes/aes128_tests/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/apb_mux_tests/makefile b/system/testcodes/apb_mux_tests/makefile
index 8f0b78d..f0fd6a6 100644
--- a/system/testcodes/apb_mux_tests/makefile
+++ b/system/testcodes/apb_mux_tests/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/bootloader/makefile b/system/testcodes/bootloader/makefile
index 4f33d1f..e4221b4 100644
--- a/system/testcodes/bootloader/makefile
+++ b/system/testcodes/bootloader/makefile
@@ -44,7 +44,7 @@ CPU_PRODUCT = CORTEX_M0
TARGET = arm-none-eabi
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/debug_tests/makefile b/system/testcodes/debug_tests/makefile
index 477ff41..5fa5656 100644
--- a/system/testcodes/debug_tests/makefile
+++ b/system/testcodes/debug_tests/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
GENERIC_DIR = ../generic
diff --git a/system/testcodes/default_slaves_tests/makefile b/system/testcodes/default_slaves_tests/makefile
index 31c1a34..2f63c9a 100644
--- a/system/testcodes/default_slaves_tests/makefile
+++ b/system/testcodes/default_slaves_tests/makefile
@@ -32,7 +32,7 @@ CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/defs.makefile b/system/testcodes/defs.makefile
index a5bdf86..7a6c245 100644
--- a/system/testcodes/defs.makefile
+++ b/system/testcodes/defs.makefile
@@ -24,7 +24,7 @@ TARGET = arm-none-eabi
TOOL_CHAIN ?= ds5
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/dhry/makefile b/system/testcodes/dhry/makefile
index 7ab62e5..06606c5 100644
--- a/system/testcodes/dhry/makefile
+++ b/system/testcodes/dhry/makefile
@@ -32,7 +32,7 @@ CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/dma_tests/makefile b/system/testcodes/dma_tests/makefile
index 5b26b23..58c8a1b 100644
--- a/system/testcodes/dma_tests/makefile
+++ b/system/testcodes/dma_tests/makefile
@@ -31,7 +31,7 @@
CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
GENERIC_DIR = ../generic
diff --git a/system/testcodes/dualtimer_demo/makefile b/system/testcodes/dualtimer_demo/makefile
index de31b25..9a749ca 100644
--- a/system/testcodes/dualtimer_demo/makefile
+++ b/system/testcodes/dualtimer_demo/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/gpio_driver_tests/makefile b/system/testcodes/gpio_driver_tests/makefile
index 6a94b08..64db24a 100644
--- a/system/testcodes/gpio_driver_tests/makefile
+++ b/system/testcodes/gpio_driver_tests/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/gpio_tests/makefile b/system/testcodes/gpio_tests/makefile
index cce0fda..b940245 100644
--- a/system/testcodes/gpio_tests/makefile
+++ b/system/testcodes/gpio_tests/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/hello/makefile b/system/testcodes/hello/makefile
index 9fd9b24..582465a 100644
--- a/system/testcodes/hello/makefile
+++ b/system/testcodes/hello/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/interrupt_demo/makefile b/system/testcodes/interrupt_demo/makefile
index ce35a40..6c248cb 100644
--- a/system/testcodes/interrupt_demo/makefile
+++ b/system/testcodes/interrupt_demo/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/memory_tests/makefile b/system/testcodes/memory_tests/makefile
index 51f07ae..28356e0 100644
--- a/system/testcodes/memory_tests/makefile
+++ b/system/testcodes/memory_tests/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/romtable_tests/makefile b/system/testcodes/romtable_tests/makefile
index 2986278..8711413 100644
--- a/system/testcodes/romtable_tests/makefile
+++ b/system/testcodes/romtable_tests/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
GENERIC_DIR = ../generic
diff --git a/system/testcodes/self_reset_demo/makefile b/system/testcodes/self_reset_demo/makefile
index e798fd6..512c921 100644
--- a/system/testcodes/self_reset_demo/makefile
+++ b/system/testcodes/self_reset_demo/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/sleep_demo/makefile b/system/testcodes/sleep_demo/makefile
index dc5a0a1..f912491 100644
--- a/system/testcodes/sleep_demo/makefile
+++ b/system/testcodes/sleep_demo/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/timer_driver_tests/makefile b/system/testcodes/timer_driver_tests/makefile
index 9f1c922..411a0d3 100644
--- a/system/testcodes/timer_driver_tests/makefile
+++ b/system/testcodes/timer_driver_tests/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/timer_tests/makefile b/system/testcodes/timer_tests/makefile
index 2f0008f..7ed138e 100644
--- a/system/testcodes/timer_tests/makefile
+++ b/system/testcodes/timer_tests/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/uart_driver_tests/makefile b/system/testcodes/uart_driver_tests/makefile
index dcc1386..492bc27 100644
--- a/system/testcodes/uart_driver_tests/makefile
+++ b/system/testcodes/uart_driver_tests/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/uart_tests/makefile b/system/testcodes/uart_tests/makefile
index 0734c4e..304643b 100644
--- a/system/testcodes/uart_tests/makefile
+++ b/system/testcodes/uart_tests/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
diff --git a/system/testcodes/watchdog_demo/makefile b/system/testcodes/watchdog_demo/makefile
index d3c0bd3..12163f7 100644
--- a/system/testcodes/watchdog_demo/makefile
+++ b/system/testcodes/watchdog_demo/makefile
@@ -32,7 +32,7 @@
CPU_PRODUCT = CORTEX_M0PLUS
# Shared software directory
-SOFTWARE_DIR = $(NANOSOC_TECH_DIR)/software
+SOFTWARE_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/software
CMSIS_DIR = $(SOFTWARE_DIR)/cmsis
CORE_DIR = $(CMSIS_DIR)/CMSIS/Include
--
GitLab