Skip to content

Commit 3fd8e5e

Browse files
josuahjosuah
committed
PREVIEW: remove the "../" prefix from everywhere
This is not expected to be merged, only there as support for discussion.
1 parent 2024db7 commit 3fd8e5e

File tree

12 files changed

+123
-130
lines changed

12 files changed

+123
-130
lines changed

‎toolkit/app-write-mram.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,8 @@ def main():
291291
argList = args.images
292292

293293
if args.skip:
294-
idx = argList.find("../build/AppTocPackage.bin 0x")
295-
argList = argList[idx : idx + 37]
296-
297-
if sys.platform == "linux" or sys.platform == "darwin":
298-
argList = argList.replace("../", "")
294+
idx = argList.find("build/AppTocPackage.bin 0x")
295+
argList = argList[idx : idx + 35]
299296

300297
# validate all parameters
301298
argList = validateArgList(action, argList.strip(), args.pad)

‎toolkit/bin/application_package.ds‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set semihosting args ../build/AppTocPackage.bin 0x8057bf50
2-
continue
3-
wait
4-
reset reset.hardware
1+
set semihosting args build/AppTocPackage.bin 0x8057bf50
2+
continue
3+
wait
4+
reset reset.hardware

‎toolkit/build/AppTocPackage.bin‎

-12.4 KB
Binary file not shown.

‎toolkit/build/AppTocPackage.bin.sign‎

0 Bytes
Binary file not shown.

‎toolkit/build/app-package-map.txt‎

-926 Bytes
Binary file not shown.

‎toolkit/build/config/app-cfg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"BLINK-HE": {
99
"disabled": false,
10-
"binary": "m55_blink_he.bin",
10+
"binary": "build/m55_blink_he.bin",
1111
"version" : "1.0.0",
1212
"signed": true,
1313
"cpu_id": "M55_HE",

‎toolkit/isp/recovery.py‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -210,29 +210,25 @@ def recovery_action_no_reset(isp):
210210
close_isp_and_exit(isp, "Image " + alif_offset + " does not exist!")
211211

212212
argList = (
213-
"../"
214-
+ alif_image
213+
alif_image
215214
+ " "
216215
+ hex(ALIF_BASE_ADDRESS)
217-
+ " ../"
216+
+ " "
218217
+ alif_offset
219218
+ " "
220219
+ hex(MRAM_BASE_ADDRESS + MRAM_SIZE - 16)
221220
)
222221

223222
# validate all parameters
224223
# argList = validateArgList(action, argList.strip())
225-
if sys.platform == "linux" or sys.platform == "darwin":
226-
argList = argList.replace("../", "")
227-
else:
224+
if sys.platform != "linux" and sys.platform != "darwin":
228225
argList = argList.replace("/", "\\")
229226

230227
items = argList.split(" ")
231228

232229
for e in range(1, len(items), 2):
233230
addr = items[e]
234231
fileName = items[e - 1]
235-
fileName = fileName.replace("..\\", "")
236232

237233
write_mram(isp, fileName, addr, False)
238234

‎toolkit/utils/cert_sb_content_util.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def create_certificate(self):
7575

7676
# Compute correct path.
7777
cert_pkg_file = self.config.cert_pkg
78-
assert cert_pkg_file.startswith("../cert/")
78+
assert cert_pkg_file.startswith("cert/")
7979
cert_pkg_file = (paths.OUTPUT_DIR / cert_pkg_file.split("/", 2)[2]).as_posix()
8080

8181
with open(cert_pkg_file, "wb") as bin_output_file:

‎toolkit/utils/cfg/OEMSBContent_lvs_1.cfg‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
# This configuration file is for the offline secure boot content certificate generation tool
2-
# cert_sb_content_util.py (Content Certificate Generation Tool - CCGT).
3-
#
4-
# The available parameters in this configuration file are the following
5-
# • [KEY-CFG] : Mandatory header.
6-
# The internal non-configurable header.
7-
# • cert-keypair : Mandatory parameter.
8-
# The file holding the RSA keypair for signing this certificate, in PEM format.
9-
# • cert-keypair-pwd : Optional. If omitted the tool prompts for direct input.
10-
# The passphrase file for the keypair file, in .txt format.
11-
# • load-verify-scheme : Mandatory parameter.
12-
# The SW image verification scheme. Supported schemes are:
13-
# - 0 : Load and verify from flash to memory.
14-
# - 1 : Full hash verification in Flash, with no loading to memory.
15-
# - 2 : Verify in memory.
16-
# - 3 : Load from flash.
17-
# Note: Option 3 is not recommended and is not allowed in Secure LCS.
18-
# • crypto-type : Mandatory parameter.
19-
# The cryptographic verification and decryption mode:
20-
# - 0 : Both AES and hash are calculated on the plain image.
21-
# - 1 : AES is calculated on the plain image, and the hash is calculated on the encrypted image.
22-
# Note: We recommend that you use the first mode.
23-
# • aes-ce-id : Mandatory parameter.
24-
# The ID of the key used for encryption, matching the entity that signed the certificate chain:
25-
# - 0 : None.
26-
# - 1 : Kceicv (ICV).
27-
# - 2 : Kce (OEM).
28-
# • aes-enc-key : Optional. Can be omitted if no encryption is needed.
29-
# The text file containing the encryption key for the authenticated SW images: Kce or Kceicv.
30-
# The contents of this file are comma-separated hex Bytes ("0x12,0x34 …") ending with "."
31-
# • images-table : Mandatory parameter.
32-
# The text file containing the list of SW image files to be processed. Each line refers to a single image,
33-
# with the following parameters: <image file name> <32b mem load addr> <32b flash store addr> <32b image max size>
34-
# <encryption flag: 0 – not encrypted, 1 -encrypted>
35-
# Notes:
36-
# - If using loading scheme option 1, the memory address is 0xffffffff (nonexisting address).
37-
# - If using loading scheme option 2, the storage address is 0xffffffff (non-existing address).
38-
# - If encryption is used, an output file named <image file name>_enc.bin is created for each encrypted image.
39-
# • nvcounter-val : Mandatory parameter.
40-
# The NV counter value:
41-
# - 0..64 : The ICV counter.
42-
# - 0..96 : The OEM counter.
43-
# - 0..160 : The full counter, if OEM and ICV are a single entity.
44-
# • cert-pkg : Mandatory parameter.
45-
# The content certificate package in binary format.
46-
[CNT-CFG]
47-
cert-keypair = key/OEMSBContent.pem
48-
cert-keypair-pwd = key/oem_keys_pass.pwd
49-
load-verify-scheme = 1
50-
crypto-type = 0
51-
aes-ce-id = 0
52-
aes-enc-key = key/kce.txt
53-
images-table = ../build/images/images.txt
54-
nvcounter-val = 0
55-
cert-pkg = ../cert/OEMSBContent.crt
1+
# This configuration file is for the offline secure boot content certificate generation tool
2+
# cert_sb_content_util.py (Content Certificate Generation Tool - CCGT).
3+
#
4+
# The available parameters in this configuration file are the following
5+
# • [KEY-CFG] : Mandatory header.
6+
# The internal non-configurable header.
7+
# • cert-keypair : Mandatory parameter.
8+
# The file holding the RSA keypair for signing this certificate, in PEM format.
9+
# • cert-keypair-pwd : Optional. If omitted the tool prompts for direct input.
10+
# The passphrase file for the keypair file, in .txt format.
11+
# • load-verify-scheme : Mandatory parameter.
12+
# The SW image verification scheme. Supported schemes are:
13+
# - 0 : Load and verify from flash to memory.
14+
# - 1 : Full hash verification in Flash, with no loading to memory.
15+
# - 2 : Verify in memory.
16+
# - 3 : Load from flash.
17+
# Note: Option 3 is not recommended and is not allowed in Secure LCS.
18+
# • crypto-type : Mandatory parameter.
19+
# The cryptographic verification and decryption mode:
20+
# - 0 : Both AES and hash are calculated on the plain image.
21+
# - 1 : AES is calculated on the plain image, and the hash is calculated on the encrypted image.
22+
# Note: We recommend that you use the first mode.
23+
# • aes-ce-id : Mandatory parameter.
24+
# The ID of the key used for encryption, matching the entity that signed the certificate chain:
25+
# - 0 : None.
26+
# - 1 : Kceicv (ICV).
27+
# - 2 : Kce (OEM).
28+
# • aes-enc-key : Optional. Can be omitted if no encryption is needed.
29+
# The text file containing the encryption key for the authenticated SW images: Kce or Kceicv.
30+
# The contents of this file are comma-separated hex Bytes ("0x12,0x34 …") ending with "."
31+
# • images-table : Mandatory parameter.
32+
# The text file containing the list of SW image files to be processed. Each line refers to a single image,
33+
# with the following parameters: <image file name> <32b mem load addr> <32b flash store addr> <32b image max size>
34+
# <encryption flag: 0 – not encrypted, 1 -encrypted>
35+
# Notes:
36+
# - If using loading scheme option 1, the memory address is 0xffffffff (nonexisting address).
37+
# - If using loading scheme option 2, the storage address is 0xffffffff (non-existing address).
38+
# - If encryption is used, an output file named <image file name>_enc.bin is created for each encrypted image.
39+
# • nvcounter-val : Mandatory parameter.
40+
# The NV counter value:
41+
# - 0..64 : The ICV counter.
42+
# - 0..96 : The OEM counter.
43+
# - 0..160 : The full counter, if OEM and ICV are a single entity.
44+
# • cert-pkg : Mandatory parameter.
45+
# The content certificate package in binary format.
46+
[CNT-CFG]
47+
cert-keypair = utils/key/OEMSBContent.pem
48+
cert-keypair-pwd = utils/key/oem_keys_pass.pwd
49+
load-verify-scheme = 1
50+
crypto-type = 0
51+
aes-ce-id = 0
52+
aes-enc-key = utils/key/kce.txt
53+
images-table = build/images/images.txt
54+
nvcounter-val = 0
55+
cert-pkg = cert/OEMSBContent.crt

‎toolkit/utils/cfg/OEMSBContent_lvs_2.cfg‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
# This configuration file is for the offline secure boot content certificate generation tool
2-
# cert_sb_content_util.py (Content Certificate Generation Tool - CCGT).
3-
#
4-
# The available parameters in this configuration file are the following
5-
# • [KEY-CFG] : Mandatory header.
6-
# The internal non-configurable header.
7-
# • cert-keypair : Mandatory parameter.
8-
# The file holding the RSA keypair for signing this certificate, in PEM format.
9-
# • cert-keypair-pwd : Optional. If omitted the tool prompts for direct input.
10-
# The passphrase file for the keypair file, in .txt format.
11-
# • load-verify-scheme : Mandatory parameter.
12-
# The SW image verification scheme. Supported schemes are:
13-
# - 0 : Load and verify from flash to memory.
14-
# - 1 : Full hash verification in Flash, with no loading to memory.
15-
# - 2 : Verify in memory.
16-
# - 3 : Load from flash.
17-
# Note: Option 3 is not recommended and is not allowed in Secure LCS.
18-
# • crypto-type : Mandatory parameter.
19-
# The cryptographic verification and decryption mode:
20-
# - 0 : Both AES and hash are calculated on the plain image.
21-
# - 1 : AES is calculated on the plain image, and the hash is calculated on the encrypted image.
22-
# Note: We recommend that you use the first mode.
23-
# • aes-ce-id : Mandatory parameter.
24-
# The ID of the key used for encryption, matching the entity that signed the certificate chain:
25-
# - 0 : None.
26-
# - 1 : Kceicv (ICV).
27-
# - 2 : Kce (OEM).
28-
# • aes-enc-key : Optional. Can be omitted if no encryption is needed.
29-
# The text file containing the encryption key for the authenticated SW images: Kce or Kceicv.
30-
# The contents of this file are comma-separated hex Bytes ("0x12,0x34 …") ending with "."
31-
# • images-table : Mandatory parameter.
32-
# The text file containing the list of SW image files to be processed. Each line refers to a single image,
33-
# with the following parameters: <image file name> <32b mem load addr> <32b flash store addr> <32b image max size>
34-
# <encryption flag: 0 – not encrypted, 1 -encrypted>
35-
# Notes:
36-
# - If using loading scheme option 1, the memory address is 0xffffffff (nonexisting address).
37-
# - If using loading scheme option 2, the storage address is 0xffffffff (non-existing address).
38-
# - If encryption is used, an output file named <image file name>_enc.bin is created for each encrypted image.
39-
# • nvcounter-val : Mandatory parameter.
40-
# The NV counter value:
41-
# - 0..64 : The ICV counter.
42-
# - 0..96 : The OEM counter.
43-
# - 0..160 : The full counter, if OEM and ICV are a single entity.
44-
# • cert-pkg : Mandatory parameter.
45-
# The content certificate package in binary format.
46-
[CNT-CFG]
47-
cert-keypair = key/OEMSBContent.pem
48-
cert-keypair-pwd = key/oem_keys_pass.pwd
49-
load-verify-scheme = 2
50-
crypto-type = 0
51-
aes-ce-id = 2
52-
aes-enc-key = key/kce.txt
53-
images-table = ../build/images/images.txt
54-
nvcounter-val = 0
55-
cert-pkg = ../cert/OEMSBContent.crt
1+
# This configuration file is for the offline secure boot content certificate generation tool
2+
# cert_sb_content_util.py (Content Certificate Generation Tool - CCGT).
3+
#
4+
# The available parameters in this configuration file are the following
5+
# • [KEY-CFG] : Mandatory header.
6+
# The internal non-configurable header.
7+
# • cert-keypair : Mandatory parameter.
8+
# The file holding the RSA keypair for signing this certificate, in PEM format.
9+
# • cert-keypair-pwd : Optional. If omitted the tool prompts for direct input.
10+
# The passphrase file for the keypair file, in .txt format.
11+
# • load-verify-scheme : Mandatory parameter.
12+
# The SW image verification scheme. Supported schemes are:
13+
# - 0 : Load and verify from flash to memory.
14+
# - 1 : Full hash verification in Flash, with no loading to memory.
15+
# - 2 : Verify in memory.
16+
# - 3 : Load from flash.
17+
# Note: Option 3 is not recommended and is not allowed in Secure LCS.
18+
# • crypto-type : Mandatory parameter.
19+
# The cryptographic verification and decryption mode:
20+
# - 0 : Both AES and hash are calculated on the plain image.
21+
# - 1 : AES is calculated on the plain image, and the hash is calculated on the encrypted image.
22+
# Note: We recommend that you use the first mode.
23+
# • aes-ce-id : Mandatory parameter.
24+
# The ID of the key used for encryption, matching the entity that signed the certificate chain:
25+
# - 0 : None.
26+
# - 1 : Kceicv (ICV).
27+
# - 2 : Kce (OEM).
28+
# • aes-enc-key : Optional. Can be omitted if no encryption is needed.
29+
# The text file containing the encryption key for the authenticated SW images: Kce or Kceicv.
30+
# The contents of this file are comma-separated hex Bytes ("0x12,0x34 …") ending with "."
31+
# • images-table : Mandatory parameter.
32+
# The text file containing the list of SW image files to be processed. Each line refers to a single image,
33+
# with the following parameters: <image file name> <32b mem load addr> <32b flash store addr> <32b image max size>
34+
# <encryption flag: 0 – not encrypted, 1 -encrypted>
35+
# Notes:
36+
# - If using loading scheme option 1, the memory address is 0xffffffff (nonexisting address).
37+
# - If using loading scheme option 2, the storage address is 0xffffffff (non-existing address).
38+
# - If encryption is used, an output file named <image file name>_enc.bin is created for each encrypted image.
39+
# • nvcounter-val : Mandatory parameter.
40+
# The NV counter value:
41+
# - 0..64 : The ICV counter.
42+
# - 0..96 : The OEM counter.
43+
# - 0..160 : The full counter, if OEM and ICV are a single entity.
44+
# • cert-pkg : Mandatory parameter.
45+
# The content certificate package in binary format.
46+
[CNT-CFG]
47+
cert-keypair = utils/key/OEMSBContent.pem
48+
cert-keypair-pwd = utils/key/oem_keys_pass.pwd
49+
load-verify-scheme = 2
50+
crypto-type = 0
51+
aes-ce-id = 2
52+
aes-enc-key = utils/key/kce.txt
53+
images-table = build/images/images.txt
54+
nvcounter-val = 0
55+
cert-pkg = cert/OEMSBContent.crt

0 commit comments

Comments
 (0)