From d03a24b12acb7907eefa0d3dc5d77f1ec5553207 Mon Sep 17 00:00:00 2001
From: Daniel Newbrook <dwn1c21@soton.ac.uk>
Date: Fri, 7 Mar 2025 13:56:59 +0000
Subject: [PATCH] Integrate AHB XiP QSPI into nanosoc branch
---
.gitmodules | 2 +-
env/dependency_env.sh | 2 +
nanosoc_tech | 2 +-
projbranch | 2 +-
set_env.sh | 4 +
.../adp_v4_cmd_tests/adp_v4_cmd_tests.hex | 394 ++++++++++++------
6 files changed, 276 insertions(+), 130 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 54d0a9b..a6fa977 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,7 +5,7 @@
[submodule "nanosoc_tech"]
path = nanosoc_tech
url = https://git.soton.ac.uk/soclabs/nanosoc_tech.git
- branch = main
+ branch = feat_qspi_rom
[submodule "soctools_flow"]
path = soctools_flow
url = https://git.soton.ac.uk/soclabs/soctools_flow.git
diff --git a/env/dependency_env.sh b/env/dependency_env.sh
index 5b610bd..7093756 100755
--- a/env/dependency_env.sh
+++ b/env/dependency_env.sh
@@ -54,3 +54,5 @@ export SOCLABS_SOCTOOLS_FLOW_DIR="$SOCLABS_PROJECT_DIR/soctools_flow"
# CHIPKIT - Register Generation
export SOCLABS_CHIPKIT_FLOW_DIR="$SOCLABS_SOCTOOLS_FLOW_DIR/tools/chipkit_flow"
+
+export SOCLABS_AHB_QSPI_DIR="$SOCLABS_PROJECT_DIR/nanosoc_tech/nanosoc/ahb_qspi"
\ No newline at end of file
diff --git a/nanosoc_tech b/nanosoc_tech
index 2142d5c..41f32dc 160000
--- a/nanosoc_tech
+++ b/nanosoc_tech
@@ -1 +1 @@
-Subproject commit 2142d5c9bd5f4b091fa6e3abf91fefda8b878a7f
+Subproject commit 41f32dc34155e671d225e964579993ff70e3b408
diff --git a/projbranch b/projbranch
index 38d8789..7525bf0 100644
--- a/projbranch
+++ b/projbranch
@@ -12,7 +12,7 @@
# Project Repository Subrepository Branch Index
# Add your Accelerator Repository here
-nanosoc_tech: main
+nanosoc_tech: feat_qspi_rom
accelerator_wrapper_tech: main
fpga_lib_tech: main
generic_lib_tech: main
diff --git a/set_env.sh b/set_env.sh
index 5155760..d902c63 100755
--- a/set_env.sh
+++ b/set_env.sh
@@ -19,3 +19,7 @@ if [ ! -f .dma350_configured ]; then
make -C nanosoc_tech/nanosoc/sldma350_tech/ config_dma_ahb
touch .dma350_configured
fi
+
+if [ ! -f ./nanosoc_tech/nanosoc/ahb_qspi/verif/VIP/SST26VF064B.v ]; then
+ make -C ./nanosoc_tech/nanosoc/ahb_qspi/ get_flash_model
+fi
\ No newline at end of file
diff --git a/system/testcodes/adp_v4_cmd_tests/adp_v4_cmd_tests.hex b/system/testcodes/adp_v4_cmd_tests/adp_v4_cmd_tests.hex
index b6c4e21..6e3d4f0 100644
--- a/system/testcodes/adp_v4_cmd_tests/adp_v4_cmd_tests.hex
+++ b/system/testcodes/adp_v4_cmd_tests/adp_v4_cmd_tests.hex
@@ -2,15 +2,15 @@
04
00
30
-3D
+59
02
00
00
-45
+61
02
00
00
-47
+63
02
00
00
@@ -42,7 +42,7 @@
00
00
00
-49
+65
02
00
00
@@ -54,139 +54,139 @@
00
00
00
-4B
+67
02
00
00
-4D
+69
02
00
00
-A1
-01
+6B
+02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
-02
+BD
+01
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
-4F
+6B
02
00
00
@@ -196,9 +196,9 @@ F0
F8
00
F0
-46
+54
F8
-0C
+12
A0
30
C8
@@ -208,32 +208,52 @@ C8
18
2D
18
+AC
+42
+01
+D1
+00
+F0
+4B
+F8
+0F
+CC
A2
46
-67
-1E
AB
46
+0C
+A7
+30
+CF
+2D
+1B
+08
+3F
+3F
+19
+7C
+42
+7F
+1E
54
-46
-5D
-46
+44
+2D
+09
+04
+26
+F4
+41
+64
+1E
AC
42
01
-D1
+D3
00
F0
38
F8
-7E
-46
-0F
-3E
-0F
-CC
-B6
-46
01
26
33
@@ -242,20 +262,24 @@ B6
D0
FB
1A
-A2
-46
-AB
-46
33
43
-18
+98
47
-DC
-03
+54
+46
+5D
+46
+DF
+E7
00
00
-FC
-03
+50
+04
+00
+00
+70
+04
00
00
10
@@ -286,6 +310,10 @@ D5
47
00
00
+70
+47
+00
+00
00
23
00
@@ -322,7 +350,7 @@ B5
D1
00
F0
-65
+9D
F9
10
BD
@@ -340,7 +368,7 @@ B5
BD
00
F0
-94
+CC
F9
11
46
@@ -354,7 +382,7 @@ F0
F8
00
F0
-AC
+E4
F9
03
B4
@@ -380,7 +408,7 @@ F8
A0
00
F0
-B6
+EE
F8
02
E0
@@ -388,11 +416,11 @@ E0
A0
00
F0
-B2
+EA
F8
00
F0
-9C
+BD
F8
01
46
@@ -404,11 +432,11 @@ D1
A0
00
F0
-AA
+E2
F8
00
F0
-9B
+CC
F8
00
20
@@ -434,11 +462,11 @@ D1
A0
00
F0
-09
+41
F9
00
F0
-8C
+BD
F8
FE
E7
@@ -563,9 +591,9 @@ BD
70
47
00
-E1
-F5
-05
+1C
+4E
+0E
04
00
00
@@ -602,7 +630,7 @@ E7
47
00
00
-2D
+49
02
00
00
@@ -632,7 +660,7 @@ C0
B2
00
F0
-1E
+36
F8
10
BD
@@ -640,11 +668,11 @@ BD
B5
00
F0
-20
+41
F8
00
F0
-18
+30
F8
10
BD
@@ -660,42 +688,96 @@ C0
B2
00
F0
-10
+28
F8
10
BD
FE
E7
-41
-20
-0F
+27
+48
+00
+21
+81
+60
+27
49
-40
01
-08
61
01
-22
-8A
+21
+81
60
-0D
-49
-08
-61
+26
+48
03
+21
+01
+61
+81
+60
+25
+49
+20
20
88
+61
+70
+47
+25
+48
+23
+49
+01
60
-0C
+24
+49
+81
+61
+01
+21
+C1
+60
+C3
+21
+81
+60
+01
+69
+C9
+07
+FC
+D0
+1D
49
20
20
88
61
+1A
+48
+00
+21
+81
+60
+30
+21
+01
+61
+03
+21
+81
+60
70
47
-09
+16
49
+8A
+68
+D2
+07
+04
+D0
4A
68
D2
@@ -706,16 +788,60 @@ D1
60
70
47
-06
-48
-41
+10
+4A
+53
68
-89
+DB
07
FC
+D1
+10
+60
+F7
+E7
+0D
+48
+0E
+49
+42
+68
+4B
+68
+92
+07
+D2
+17
+9B
+07
+DB
+17
+52
+1C
+5B
+1C
+1A
+42
+F5
+D1
+42
+68
+92
+07
+01
D5
00
68
+03
+E0
+48
+68
+80
+07
+01
+D5
+08
+68
C0
B2
70
@@ -724,16 +850,18 @@ B2
20
FF
F7
-F0
+D7
FF
FE
E7
00
-00
-00
60
00
40
+6A
+18
+00
+00
00
E0
00
@@ -742,6 +870,18 @@ E0
10
01
40
+8E
+0C
+01
+00
+00
+20
+00
+40
+24
+F4
+00
+00
70
47
00
@@ -840,7 +980,7 @@ FF
46
FF
F7
-F8
+C0
FE
00
28
@@ -974,7 +1114,7 @@ B5
E0
FF
F7
-51
+19
FF
40
1C
@@ -994,7 +1134,7 @@ D1
20
FF
F7
-47
+0F
FF
10
BD
@@ -1080,8 +1220,8 @@ F8
46
FF
F7
-27
-FF
+EF
+FE
00
28
02
@@ -1098,8 +1238,8 @@ BD
BD
00
00
-43
-FE
+D3
+FD
FF
FF
01
@@ -1176,18 +1316,16 @@ B0
B5
FF
F7
-DA
+A2
FE
60
BC
-00
-27
-49
-08
B6
46
00
26
+00
+27
C0
C5
C0
@@ -1207,6 +1345,8 @@ C5
40
3D
49
+08
+49
00
8D
46
@@ -1224,7 +1364,7 @@ C0
46
FF
F7
-4D
+15
FE
10
BD
@@ -1234,12 +1374,12 @@ BD
48
70
47
-0C
+10
00
00
30
-F8
-04
+84
+05
00
00
00
@@ -1250,23 +1390,23 @@ F8
00
00
00
-04
+1C
01
00
00
-04
+90
05
00
00
-0C
+10
00
00
30
-64
+60
04
00
00
-20
+3C
01
00
00
@@ -1275,9 +1415,9 @@ F8
00
00
00
-E1
-F5
-05
+1C
+4E
+0E
00
00
00
--
GitLab