alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

nvs_part_gen: Add changes to partition size input

Browse Source
This commit is contained in:
Shivani Tipnis 2018-10-08 11:11:56 +05:30
parent 4bc87a414f
commit fb31788504
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/nvs_flash/nvs_partition_generator/README.rst
View File

@ -123,7 +123,7 @@ A sample CSV file is provided with the utility::
+------------------------+----------------------------------------------------------------------------------------------+ +------------------------+----------------------------------------------------------------------------------------------+
| output | Path to output converted binary file. Will use stdout if omitted | | output | Path to output converted binary file. Will use stdout if omitted |
+------------------------+----------------------------------------------------------------------------------------------+ +------------------------+----------------------------------------------------------------------------------------------+
| size | Size of NVS Partition in KB. Eg. 12KB | | size | Size of NVS Partition in hex (must be multiple of 4096). Eg. 0x1000 |
+------------------------+----------------------------------------------------------------------------------------------+ +------------------------+----------------------------------------------------------------------------------------------+
| --version {v1,v2} | Set version. Default: v2 | | --version {v1,v2} | Set version. Default: v2 |
+-------------------------------+---------------------------------------------------------------------------------------+ +-------------------------------+---------------------------------------------------------------------------------------+

23
components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py
View File

@ -179,7 +179,7 @@ class Page(object):
data_input = byte_arr data_input = byte_arr
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
data_input = binascii.hexlify(bytearray(data_input)) data_input = binascii.hexlify(bytearray(data_input))
else: else:
@ -214,7 +214,6 @@ class Page(object):
data_val = str(data_bytes) + (init_data_val * (data_len_needed - len(data_bytes))) data_val = str(data_bytes) + (init_data_val * (data_len_needed - len(data_bytes)))
encr_data_ret = self.encrypt_entry(data_val, tweak_val, encr_key_input) encr_data_ret = self.encrypt_entry(data_val, tweak_val, encr_key_input)
#print("\n<<<\n")
encr_data_to_write = encr_data_to_write + encr_data_ret encr_data_to_write = encr_data_to_write + encr_data_ret
# Update values for encrypting next set of data bytes # Update values for encrypting next set of data bytes
start_idx = end_idx start_idx = end_idx
@ -233,7 +232,7 @@ class Page(object):
encr_data[0:len(encr_data_ret)] = encr_data_ret encr_data[0:len(encr_data_ret)] = encr_data_ret
else: else:
encr_data[0:len(encr_data_ret)] = encr_data_ret encr_data[0:len(encr_data_ret)] = encr_data_ret
data = encr_data data = encr_data
data_offset = Page.FIRST_ENTRY_OFFSET + (Page.SINGLE_ENTRY_SIZE * self.entry_num) data_offset = Page.FIRST_ENTRY_OFFSET + (Page.SINGLE_ENTRY_SIZE * self.entry_num)
@ -311,7 +310,7 @@ class Page(object):
if not sys.version_info[0] < 3: if not sys.version_info[0] < 3:
if type(data_chunk) == str: if type(data_chunk) == str:
data_chunk = codecs.encode(data_chunk, 'utf8') data_chunk = codecs.encode(data_chunk, 'utf8')
crc = zlib.crc32(data_chunk, 0xFFFFFFFF) crc = zlib.crc32(data_chunk, 0xFFFFFFFF)
struct.pack_into('<I', entry_struct, 28, crc & 0xFFFFFFFF) struct.pack_into('<I', entry_struct, 28, crc & 0xFFFFFFFF)
@ -466,7 +465,7 @@ class Page(object):
# write key # write key
key_array = bytearray(b'\x00')*16 key_array = bytearray(b'\x00')*16
entry_struct[8:24] = key_array entry_struct[8:24] = key_array
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
entry_struct[8:8 + len(key)] = key entry_struct[8:8 + len(key)] = key
else: else:
@ -748,7 +747,7 @@ def nvs_part_gen(input_filename=None, output_filename=None, input_size=None, key
input_file = open(input_filename, 'rb') input_file = open(input_filename, 'rb')
else: else:
input_file = open(input_filename, 'r', newline='') input_file = open(input_filename, 'r', newline='')
output_file = open(output_filename, 'wb') output_file = open(output_filename, 'wb')
with nvs_open(output_file, input_size) as nvs_obj: with nvs_open(output_file, input_size) as nvs_obj:
@ -768,24 +767,24 @@ def nvs_part_gen(input_filename=None, output_filename=None, input_size=None, key
if is_encrypt_data: if is_encrypt_data:
output_keys_file = open("encryption_keys.bin",'wb') output_keys_file = open("encryption_keys.bin",'wb')
keys_page_buf = bytearray(b'\xff')*Page.PAGE_PARAMS["max_size"] keys_page_buf = bytearray(b'\xff')*Page.PAGE_PARAMS["max_size"]
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
key_bytes = key_input.decode('hex') key_bytes = key_input.decode('hex')
else: else:
key_bytes = bytearray() key_bytes = bytearray()
key_bytes = codecs.decode(key_input, 'hex') key_bytes = codecs.decode(key_input, 'hex')
key_len = len(key_bytes) key_len = len(key_bytes)
keys_page_buf[0:key_len] = key_bytes keys_page_buf[0:key_len] = key_bytes
crc_data = keys_page_buf[0:key_len] crc_data = keys_page_buf[0:key_len]
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
crc = zlib.crc32(buffer(crc_data), 0xFFFFFFFF) crc = zlib.crc32(buffer(crc_data), 0xFFFFFFFF)
else: else:
crc = zlib.crc32(memoryview(crc_data), 0xFFFFFFFF) crc = zlib.crc32(memoryview(crc_data), 0xFFFFFFFF)
struct.pack_into('<I', keys_page_buf, key_len, crc & 0xFFFFFFFF) struct.pack_into('<I', keys_page_buf, key_len, crc & 0xFFFFFFFF)
output_keys_file.write(keys_page_buf) output_keys_file.write(keys_page_buf)

4
tools/mass_mfg/docs/README.rst
View File

@ -120,7 +120,7 @@ The mfg\_gen.py utility is using the generated CSV Configuration file and Master
+------------------------+----------------------------------------------------------------------------------------------+ +------------------------+----------------------------------------------------------------------------------------------+
| Arguments | Description | | Arguments | Description |
+========================+==============================================================================================+ +========================+==============================================================================================+
| --size PART_SIZE | the size of NVS Partition in KB. Eg. 12KB | | --size PART_SIZE | Size of NVS Partition in hex (must be multiple of 4096). Eg. 0x1000 |
+------------------------+----------------------------------------------------------------------------------------------+ +------------------------+----------------------------------------------------------------------------------------------+
| --conf CONFIG_FILE | the input configuration csv file | | --conf CONFIG_FILE | the input configuration csv file |
+------------------------+----------------------------------------------------------------------------------------------+ +------------------------+----------------------------------------------------------------------------------------------+
@ -136,7 +136,7 @@ The mfg\_gen.py utility is using the generated CSV Configuration file and Master
**You can use the below command to run this utility with the sample files provided**:: **You can use the below command to run this utility with the sample files provided**::
$ ./mfg_gen.py --size 12KB --conf samples/sample_config.csv --values samples/sample_values.csv --prefix Fan $ ./mfg_gen.py --size 0x3000 --conf samples/sample_config.csv --values samples/sample_values.csv --prefix Fan
.. note:: The default numeric value: 1,2,3... of ``fileid`` argument, corresponds to each row having device instance values in master csv values file. .. note:: The default numeric value: 1,2,3... of ``fileid`` argument, corresponds to each row having device instance values in master csv values file.

5
tools/mass_mfg/mfg_gen.py
View File

@ -22,9 +22,10 @@ import csv
import argparse import argparse
import shutil import shutil
import distutils.dir_util import distutils.dir_util
from itertools import zip_longest
sys.path.insert(0, os.getenv('IDF_PATH') + "/components/nvs_flash/nvs_partition_generator/") sys.path.insert(0, os.getenv('IDF_PATH') + "/components/nvs_flash/nvs_partition_generator/")
import nvs_partition_gen import nvs_partition_gen
if not sys.version_info[0] < 3:
from itertools import zip_longest
def verify_values_exist(input_values_file, keys_in_values_file): def verify_values_exist(input_values_file, keys_in_values_file):
""" Verify all keys have corresponding values in values file """ Verify all keys have corresponding values in values file
@ -306,7 +307,7 @@ file_identifier=None,output_dir_path=None):
parser.add_argument("--size", parser.add_argument("--size",
dest='part_size', dest='part_size',
required=True, required=True,
help='Size of NVS Partition in KB. Eg. 12KB') help='Size of NVS Partition in hex (must be multiple of 4096). Eg. 0x1000')
parser.add_argument('--conf', parser.add_argument('--conf',
dest='config_file', dest='config_file',