Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restored MockCertificateModel and relaxed schema that was too rigid. #274

Merged
merged 1 commit into from
Nov 16, 2024
Merged

Restored MockCertificateModel and relaxed schema that was too rigid. #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ task :regress do
ENV["VERSIONS"] = "all"
Rake::Task["gen:html_manual"].invoke
Rake::Task["gen:html"].invoke("generic_rv64")
Rake::Task["#{$root}/gen/certificate_doc/pdf/MockCertificateModel100.pdf"].invoke
Rake::Task["#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"].invoke
Rake::Task["#{$root}/gen/certificate_doc/pdf/MC100.pdf"].invoke
Rake::Task["#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"].invoke
Rake::Task["#{$root}/gen/profile_doc/pdf/RVA20.pdf"].invoke
Expand Down
1 change: 1 addition & 0 deletions arch/certificate_class/MockCertificateClass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ introduction: |

naming_scheme: |
Here's the Mock Certificate Class naming scheme.
A Mock certificate class or model can have any name as long as it can be a hash key.

mandatory_priv_modes:
- M
1 change: 0 additions & 1 deletion arch/certificate_model/MC100.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ name: MC100
long_name: Basic Microcontroller Certificate
class:
$ref: certificate_class/MC.yaml#
model: 100

# Semantic versions within the model
versions:
Expand Down
3 changes: 1 addition & 2 deletions ...ficate_model/MockCertificateModel100.yaml → ...rtificate_model/MockCertificateModel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@

$schema: cert_model_schema.json#
kind: certificate model
name: MockCertificateModel100
name: MockCertificateModel
long_name: Mock Certificate Model Long Name
class:
$ref: certificate_class/MockCertificateClass.yaml#
model: 100

# XLEN used by rakefile
base: 64
Expand Down
7 changes: 1 addition & 6 deletions schemas/cert_model_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"name": {
"type": "string",
"pattern": "^[A-Z][a-zA-Z_]*[0-9]+$",
"pattern": "^[A-Z][a-zA-Z0-9_]*$",
"description": "The short name of the model, used as a database key"
},
"long_name": {
Expand All @@ -32,11 +32,6 @@
},
"description": "Reference to the class this model belongs to"
},
"model": {
"type": "integer",
"minimum": 0,
"description": "Model number"
},
"versions": {
"type": "array",
"items": {
Expand Down
Loading