diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c29e5e3e4642a686e431468110d3cae107f45e10..f57d177fe9eb0d9784f4b1bd0260e8efde1ff1d4 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 619fe214a8a5f06170ba857abb525eb9442c037f..cb5f6b676e1f2820708e82298d60564ffd8e0240 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 390704d24f1a6df39d4a94938b1f934a8e19425a..7bd7973cf7d17a39ec52349b16e5b0dbf4aec0e4 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 f0a782eaf3ada5a44ed273885df6973558900e8a..f426e6bfc578da88826e69ac83cc17358c90744d 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 2412557bc24fd8d1b72ceb921153725bd2bf5bd9..5d6a83e330d2aa6130e73d790b93bb42ce02b88c 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 965b6ef9ee7d004b7db2c4c65f740aa979634c60..70938b91cf8ce9076ba0581b9b6ccc1e321386c9 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 8f0b78d869245d629e4b33aa3fac85f3282d0946..f0fd6a6d4dd446337e78b001d0f6a5c573ba9cb4 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 4f33d1f4fdccacce6eb28bd2e7f20c82cdbbf46f..e4221b47dc54a3016e544492829be0141d02ec0b 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 477ff41916339d9899621a5092254e543b372cff..5fa5656cc52bff72366155cd2d46dfbbd8486dc2 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 31c1a34731bd947e8564b6e9ddd4ce6abaafda39..2f63c9a75a83380c88183d07c1114a4b6ca238fa 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 a5bdf8615ceb63406701b3f76a6617c8ed1dc3e9..7a6c24571f287d46f179f0b91ee4123fc1d274aa 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 7ab62e512d6133af12070ec9bf7f51dbb5369009..06606c5e0c36fae8c1efb068d35797f7d40cc1a8 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 5b26b238588323e92cdeea55d4aa110342693b93..58c8a1bb2a79e1390ad9cca73a7a20d94a1b3cbe 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 de31b2515ccf22cc16854104b610a49cdac8468b..9a749ca7dfcc787b9e02e0b005e1f85b6db7bb75 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 6a94b08f9c94c45b61d97878f41a45533a45a236..64db24a940b1c3d5f40b0edfde56a3f7aa425c05 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 cce0fdaa9f79955f63f8bf80bebf58a02e102256..b94024562e4be1d234137beeef64cad7986845d6 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 9fd9b24244dfbe7a148d97141a21a48fa6211eef..582465a2581c81d02452d107d301649ab125c121 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 ce35a40ff669d2d2f6c032743eb8be85aa2c0c05..6c248cbf6b561ee17eca2e289d2a45f4b38bed09 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 51f07ae484e78f0a52644100f0b7d720d59ca9c0..28356e0fa8b2280dd670404c70ca5affcecc4e32 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 2986278747c3ddf5ac8537bc4292f7ae7b68041b..87114132ea870160dfff94a1ef6e02e767104843 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 e798fd62d6530a14901ff4e456cb7fb444b22a82..512c921f0c817ef7465f92ebbbf81943b8fb1807 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 dc5a0a182acafe3bd62838691c18b5ed7aa740d3..f9124916371b7f794372d6dc8a43d48c5058fdc4 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 9f1c922aa5ecdb5406802a4d336bdd52f43fc7cf..411a0d391301b1b9fa30627c6b5bf5e3685559be 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 2f0008ff07d5c56fa17896993fdcbd7490792b92..7ed138e029d5ad776bf642ecb4cfb8fe3263b87a 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 dcc13864ac8d9e9f27ffab0123ba00e915a4b543..492bc2712c8ab9036a0eaab1a0af496327a8948b 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 0734c4efb28db1905dca6d5cc79faa3e420d88d9..304643b8e31de3a9be1131fe729b689e9a2af0d6 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 d3c0bd379d07e823ef949be56e41e0ede80f0c15..12163f7ff96a112916f71f514eb50de873191318 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