commit 0b4ccdd7c916ee87ef571a4c94d067a110fa1db7
author Tom Cosgrove <tom.cosgrove@arm.com> Thu Oct 10 13:53:14 2024 +0000
committer GitHub <noreply@github.com> Thu Oct 10 13:53:14 2024 +0000
tree 1db5cc302432fc44f2e008b7d88b227ab37f4822
parent 80352ac58c4bd4ba0a98608f527c6a3c4a49239f
parent a3c2a8f2a297b582b443f0ac3e5cf7eb3115a031

Merge pull request #9674 from gergelykarm/development

Fix driver schema json default type requirements

ChangeLog.d/fix-driver-schema-check.txt

diff --git a/ChangeLog.d/fix-driver-schema-check.txt b/ChangeLog.d/fix-driver-schema-check.txt
new file mode 100644
index 0000000..9b6d8ac
--- /dev/null
+++ b/ChangeLog.d/fix-driver-schema-check.txt
@@ -0,0 +1,3 @@
+Bugfix
+   * Fix invalid JSON schemas for driver descriptions used by
+     generate_driver_wrappers.py.

scripts/data_files/driver_jsons/driver_opaque_schema.json

diff --git a/scripts/data_files/driver_jsons/driver_opaque_schema.json b/scripts/data_files/driver_jsons/driver_opaque_schema.json
index 933eb07..b05da00 100644
--- a/scripts/data_files/driver_jsons/driver_opaque_schema.json
+++ b/scripts/data_files/driver_jsons/driver_opaque_schema.json
@@ -11,7 +11,7 @@
     },
     "type": {
       "type": "string",
-      "const": ["opaque"]
+      "const": "opaque"
     },
     "location": {
       "type": ["integer","string"],

scripts/data_files/driver_jsons/driver_transparent_schema.json

diff --git a/scripts/data_files/driver_jsons/driver_transparent_schema.json b/scripts/data_files/driver_jsons/driver_transparent_schema.json
index f5d91eb..1791163 100644
--- a/scripts/data_files/driver_jsons/driver_transparent_schema.json
+++ b/scripts/data_files/driver_jsons/driver_transparent_schema.json
@@ -11,7 +11,7 @@
     },
     "type": {
       "type": "string",
-      "const": ["transparent"]
+      "const": "transparent"
     },
     "mbedtls/h_condition": {
       "type": "string"