aboutsummaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorAndrei Narkevitch <ainh@cypress.com>2020-09-09 15:38:34 -0700
committerDavid Hu <david.hu@arm.com>2020-09-24 02:47:44 +0000
commit0d20dd9fce3154130f5f7a0de60593f9c001b55e (patch)
tree1922eb60d389161e19e78eac907d82501eff848b /platform
parent16face58be133b19419a6c309ac88925e99aaa71 (diff)
downloadtrusted-firmware-m-0d20dd9fce3154130f5f7a0de60593f9c001b55e.tar.gz
Platform PSoC64: move policy file to the policy directory
Signed-off-by: Andrei Narkevitch <ainh@cypress.com> Change-Id: I6f4cc2354267b0402af4b3d5867d89cdab1d5fa1
Diffstat (limited to 'platform')
-rw-r--r--platform/ext/target/cypress/psoc64/cypress_psoc64_spec.rst10
-rw-r--r--platform/ext/target/cypress/psoc64/security/keys/readme.rst4
-rw-r--r--platform/ext/target/cypress/psoc64/security/policy/policy_multi_img_CM0p_CM4_debug_2M.json (renamed from platform/ext/target/cypress/psoc64/security/policy_multi_img_CM0p_CM4_debug_2M.json)32
-rw-r--r--platform/ext/target/cypress/psoc64/security/policy/policy_multi_img_CM0p_CM4_debug_2M_legacy.json (renamed from platform/ext/target/cypress/psoc64/security/policy_multi_img_CM0p_CM4_debug_2M_legacy.json)16
4 files changed, 31 insertions, 31 deletions
diff --git a/platform/ext/target/cypress/psoc64/cypress_psoc64_spec.rst b/platform/ext/target/cypress/psoc64/cypress_psoc64_spec.rst
index eca659451f..b4ff0a62eb 100644
--- a/platform/ext/target/cypress/psoc64/cypress_psoc64_spec.rst
+++ b/platform/ext/target/cypress/psoc64/cypress_psoc64_spec.rst
@@ -312,7 +312,7 @@ policy_multi_img_CM0p_CM4_debug_2M_legacy.json:
.. code-block:: bash
./platform/ext/target/cypress/psoc64/security/sign.py \
- -p platform/ext/target/cypress/psoc64/security/policy_multi_img_CM0p_CM4_debug_2M_legacy.json \
+ -p platform/ext/target/cypress/psoc64/security/policy/policy_multi_img_CM0p_CM4_debug_2M_legacy.json \
-d cy8ckit-064b0s2-4343w \
-s <build folder>/tfm_s.hex \
-n <build folder>/tfm_ns.hex
@@ -322,14 +322,14 @@ Note: each image can be signed individually, for example:
.. code-block:: bash
./platform/ext/target/cypress/psoc64/security/sign.py \
- -p platform/ext/target/cypress/psoc64/security/policy_multi_img_CM0p_CM4_debug_2M_legacy.json \
+ -p platform/ext/target/cypress/psoc64/security/policy/policy_multi_img_CM0p_CM4_debug_2M_legacy.json \
-d cy8ckit-064b0s2-4343w \
-n <build folder>/tfm_ns.hex
.. code-block:: bash
./platform/ext/target/cypress/psoc64/security/sign.py \
- -p platform/ext/target/cypress/psoc64/security/policy_multi_img_CM0p_CM4_debug_2M_legacy.json \
+ -p platform/ext/target/cypress/psoc64/security/policy/policy_multi_img_CM0p_CM4_debug_2M_legacy.json \
-d cy8ckit-064b0s2-4343w \
-s <build folder>/tfm_s.hex
@@ -352,7 +352,7 @@ SPE image:
.. code-block:: bash
cysecuretools \
- --policy platform/ext/target/cypress/psoc64/security/policy_multi_img_CM0p_CM4_debug_2M.json \
+ --policy platform/ext/target/cypress/psoc64/security/policy/policy_multi_img_CM0p_CM4_debug_2M.json \
--target cy8ckit-064b0s2-4343w \
sign-image \
--hex <build folder>/tfm_s.hex \
@@ -364,7 +364,7 @@ NSPE image:
.. code-block:: bash
cysecuretools \
- --policy platform/ext/target/cypress/psoc64/security/policy_multi_img_CM0p_CM4_debug_2M.json \
+ --policy platform/ext/target/cypress/psoc64/security/policy/policy_multi_img_CM0p_CM4_debug_2M.json \
--target cy8ckit-064b0s2-4343w \
sign-image \
--hex <build folder>/tfm_ns.hex \
diff --git a/platform/ext/target/cypress/psoc64/security/keys/readme.rst b/platform/ext/target/cypress/psoc64/security/keys/readme.rst
index 3b9afee3bc..5c4ebba547 100644
--- a/platform/ext/target/cypress/psoc64/security/keys/readme.rst
+++ b/platform/ext/target/cypress/psoc64/security/keys/readme.rst
@@ -13,13 +13,13 @@ Use cysecuretools to generate the key pairs defined by the policy file, for exam
.. code-block:: bash
cd platform/ext/target/cypress/psoc64/security
cysecuretools -t cy8ckit-064b0s2-4343w init
- cysecuretools -t cy8ckit-064b0s2-4343w -p policy_multi_img_CM0p_CM4_debug_2M.json create-keys
+ cysecuretools -t cy8ckit-064b0s2-4343w -p policy/policy_multi_img_CM0p_CM4_debug_2M.json create-keys
Signing keys have to be provisioned to the board:
.. code-block:: bash
- cysecuretools -t cy8ckit-064b0s2-4343w -p policy_multi_img_CM0p_CM4_debug_2M.json re-provision-device
+ cysecuretools -t cy8ckit-064b0s2-4343w -p policy/policy_multi_img_CM0p_CM4_debug_2M.json re-provision-device
Please refer to cysecuretools documentation and cypress_psoc64_spec.rst for more details.
diff --git a/platform/ext/target/cypress/psoc64/security/policy_multi_img_CM0p_CM4_debug_2M.json b/platform/ext/target/cypress/psoc64/security/policy/policy_multi_img_CM0p_CM4_debug_2M.json
index e2bec12258..9a03aee910 100644
--- a/platform/ext/target/cypress/psoc64/security/policy_multi_img_CM0p_CM4_debug_2M.json
+++ b/platform/ext/target/cypress/psoc64/security/policy/policy_multi_img_CM0p_CM4_debug_2M.json
@@ -96,7 +96,7 @@
6
],
"boot_keys": [
- { "kid": 6, "key": "./keys/TFM_S_KEY.json" }
+ { "kid": 6, "key": "../keys/TFM_S_KEY.json" }
],
"id": 1,
"monotonic": 0,
@@ -107,14 +107,14 @@
"version": "0.1",
"rollback_counter": 0,
"encrypt": false,
- "encrypt_key": "./keys/image-aes-128.key",
+ "encrypt_key": "../keys/image-aes-128.key",
"encrypt_key_id": 1,
- "encrypt_peer": "./keys/dev_pub_key.pem",
+ "encrypt_peer": "../keys/dev_pub_key.pem",
"upgrade_auth": [
6
],
"upgrade_keys": [
- { "kid": 6, "key": "./keys/TFM_S_KEY.json" }
+ { "kid": 6, "key": "../keys/TFM_S_KEY.json" }
],
"resources": [
{
@@ -134,7 +134,7 @@
8
],
"boot_keys": [
- { "kid": 8, "key": "./keys/TFM_NS_KEY.json" }
+ { "kid": 8, "key": "../keys/TFM_NS_KEY.json" }
],
"id": 16,
"monotonic": 8,
@@ -144,14 +144,14 @@
"version": "0.1",
"rollback_counter": 0,
"encrypt": false,
- "encrypt_key": "./keys/image-aes-128.key",
+ "encrypt_key": "../keys/image-aes-128.key",
"encrypt_key_id": 1,
- "encrypt_peer": "./keys/dev_pub_key.pem",
+ "encrypt_peer": "../keys/dev_pub_key.pem",
"upgrade_auth": [
8
],
"upgrade_keys": [
- { "kid": 8, "key": "./keys/TFM_NS_KEY.json" }
+ { "kid": 8, "key": "../keys/TFM_NS_KEY.json" }
],
"resources": [
{
@@ -184,18 +184,18 @@
},
"provisioning":
{
- "packet_dir": "./packets",
+ "packet_dir": "../packets",
"chain_of_trust": []
},
"pre_build": {
- "oem_public_key": "./keys/oem_state.json",
- "oem_private_key": "./keys/oem_state.json",
- "hsm_public_key": "./keys/hsm_state.json",
- "hsm_private_key": "./keys/hsm_state.json",
+ "oem_public_key": "../keys/oem_state.json",
+ "oem_private_key": "../keys/oem_state.json",
+ "hsm_public_key": "../keys/hsm_state.json",
+ "hsm_private_key": "../keys/hsm_state.json",
"provision_group_private_key": false,
- "group_private_key": "./keys/grp_priv_key.json",
+ "group_private_key": "../keys/grp_priv_key.json",
"provision_device_private_key": false,
- "device_private_key": "./keys/dev_priv_key.json",
- "cy_auth": "./packets/cy_auth_2m_s0_sample.jwt"
+ "device_private_key": "../keys/dev_priv_key.json",
+ "cy_auth": "../packets/cy_auth_2m_s0_sample.jwt"
}
}
diff --git a/platform/ext/target/cypress/psoc64/security/policy_multi_img_CM0p_CM4_debug_2M_legacy.json b/platform/ext/target/cypress/psoc64/security/policy/policy_multi_img_CM0p_CM4_debug_2M_legacy.json
index fe64673f63..f1e4b23090 100644
--- a/platform/ext/target/cypress/psoc64/security/policy_multi_img_CM0p_CM4_debug_2M_legacy.json
+++ b/platform/ext/target/cypress/psoc64/security/policy/policy_multi_img_CM0p_CM4_debug_2M_legacy.json
@@ -89,7 +89,7 @@
8
],
"boot_keys": [
- { "kid": 8, "key": "./keys/USERAPP_CM4_KEY.json" }
+ { "kid": 8, "key": "../keys/USERAPP_CM4_KEY.json" }
],
"id": 1,
"launch": 16,
@@ -100,14 +100,14 @@
"version": "0.1",
"rollback_counter": 0,
"encrypt": false,
- "encrypt_key": "./keys/image-aes-128.key",
+ "encrypt_key": "../keys/image-aes-128.key",
"encrypt_key_id": 1,
- "encrypt_peer": "./keys/dev_pub_key.pem",
+ "encrypt_peer": "../keys/dev_pub_key.pem",
"upgrade_auth": [
8
],
"upgrade_keys": [
- { "kid": 8, "key": "./keys/USERAPP_CM4_KEY.json" }
+ { "kid": 8, "key": "../keys/USERAPP_CM4_KEY.json" }
],
"backup": false,
"resources": [
@@ -128,7 +128,7 @@
8
],
"boot_keys": [
- { "kid": 8, "key": "./keys/USERAPP_CM4_KEY.json" }
+ { "kid": 8, "key": "../keys/USERAPP_CM4_KEY.json" }
],
"id": 16,
"monotonic": 0,
@@ -138,14 +138,14 @@
"version": "0.1",
"rollback_counter": 0,
"encrypt": false,
- "encrypt_key": "./keys/image-aes-128.key",
+ "encrypt_key": "../keys/image-aes-128.key",
"encrypt_key_id": 1,
- "encrypt_peer": "./keys/dev_pub_key.pem",
+ "encrypt_peer": "../keys/dev_pub_key.pem",
"upgrade_auth": [
8
],
"upgrade_keys": [
- { "kid": 8, "key": "./keys/USERAPP_CM4_KEY.json" }
+ { "kid": 8, "key": "../keys/USERAPP_CM4_KEY.json" }
],
"backup": false,
"resources": [