Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
AES128 Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SoCLabs
AES128 Project
Commits
5de5a24b
Commit
5de5a24b
authored
6 months ago
by
dwf1m12
Browse files
Options
Downloads
Plain Diff
resolve fork merge issues with accelerator-project
parents
bc147008
4d1a99a0
No related branches found
No related tags found
No related merge requests found
Pipeline
#11742
passed
5 months ago
Stage: compile
Stage: simulate
Stage: simulate_qs
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitmodules
+1
-1
1 addition, 1 deletion
.gitmodules
simulate/socsim/regression_nanosoc.sh
+1
-0
1 addition, 0 deletions
simulate/socsim/regression_nanosoc.sh
with
2 additions
and
1 deletion
.gitmodules
+
1
−
1
View file @
5de5a24b
...
...
@@ -24,7 +24,7 @@
branch = main
[submodule "asic_lib_tech"]
path = asic_lib_tech
url = https://git.soton.ac.uk/soclabs/asic_library_tech
url = https://git.soton.ac.uk/soclabs/asic_library_tech
.git
branch = main
[submodule "secworks-aes"]
path = secworks-aes
...
...
This diff is collapsed.
Click to expand it.
simulate/socsim/regression_nanosoc.sh
+
1
−
0
View file @
5de5a24b
...
...
@@ -27,5 +27,6 @@ echo ${2}
make
-C
$SOCLABS_NANOSOC_TECH_DIR
regression_mti
\
SIM_DIR
=
$SIM_DIR
\
ACCELERATOR
=
yes
\
FAST_SIM
=
no
\
${
@
:2
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment