X-Git-Url: https://robinkrens.nl/gitweb/?a=blobdiff_plain;f=src%2FRAFlasher.py;h=025bee48f9b3e34592c0321d56dee549decd4dd6;hb=5bc6b530d89045f25e246d471fbb7deb70e7f10c;hp=0e5659bc1519ce2633323ca683faa7bcb524d690;hpb=dd0b210e12a5ee5b62437eff857b8ea1573493c7;p=renesas-ra-flasher diff --git a/src/RAFlasher.py b/src/RAFlasher.py index 0e5659b..025bee4 100644 --- a/src/RAFlasher.py +++ b/src/RAFlasher.py @@ -2,11 +2,14 @@ import os import math import time import argparse +import tempfile from tqdm import tqdm from RAConnect import * from RAPacker import * SECTOR_SIZE = 2048 +VENDOR_ID = 0x045B +PRODUCT_ID = 0x0261 def int_to_hex_list(num): hex_string = hex(num)[2:].upper() # convert to hex string @@ -14,15 +17,30 @@ def int_to_hex_list(num): hex_list = [f'0x{hex_string[c:c+2]}' for c in range(0, 8, 2)] return hex_list -def inquire_connection(dev): - packed = pack_pkt(INQ_CMD, "") - dev.send_data(packed) - info = dev.recv_data(7) - if info == bytearray(b'\x00') or info == bytearray(b''): - return False - msg = unpack_pkt(info) - #print("Connection already established") - return True +def hex_type(string): + try: + value = int(string, 16) + return value + except ValueError: + raise argparse.ArgumentTypeError(f"'{string}' is not a valid hexadecimal value.") + +def set_size_boundaries(start_addr, size): + if start_addr % SECTOR_SIZE: + raise ValueError(f"start addr not aligned on sector size {SECTOR_SIZE}") + + if size < SECTOR_SIZE: + print("Warning: you are trying to write something that is less than one sector size: padding with zeroes") + + blocks = (size + SECTOR_SIZE - 1) // SECTOR_SIZE + end_addr = blocks * SECTOR_SIZE + start_addr - 1 + + if (end_addr <= start_addr): + raise ValueError(f"End address smaller or equal than start_address") + + if (end_addr > 0x3FFFF): + raise ValueError(f"Binary file is bigger than available ROM space") + + return (start_addr, end_addr) def get_area_info(dev): for i in [0,1,2]: @@ -46,7 +64,7 @@ def get_dev_info(dev): elif TYP == 0x03: print('Chip: RA MCU + RA6 Series') else: - print('Unknown MCU type') + rint('Unknown MCU type') print(f'Serial interface speed: {SCI} Hz') print(f'Recommend max UART baud rate: {RMB} bps') print(f'User area in Code flash [{NOA & 0x1}|{NOA & 0x02 >> 1}]') @@ -54,27 +72,31 @@ def get_dev_info(dev): print(f'Config area [{NOA & 0x04 >> 3}]') print(f'Boot firmware: version {BFV >> 8}.{BFV & 0xFF}') +def erase_chip(dev, start_addr, size): + + if size == None: + size = 0x3FFFF - start_addr # erase all + + (start_addr, end_addr) = set_size_boundaries(start_addr, size) + print(f'Erasing {hex(start_addr)}:{hex(end_addr)}') -def verify_img(dev, img, start_addr, end_addr): - raise Exception("Not implemented") - -def read_img(dev, img, start_addr, end_addr): + # setup initial communication + SAD = int_to_hex_list(start_addr) + EAD = int_to_hex_list(end_addr) + packed = pack_pkt(ERA_CMD, SAD + EAD) + dev.send_data(packed) - # calculate / check start and end address - if start_addr == None or end_addr == None: - if start_addr == None: - start_addr = 0 - # align start addr - if start_addr % SECTOR_SIZE: - raise ValueError(f"start addr not aligned on sector size {SECTOR_SIZE}") - blocks = (file_size + SECTOR_SIZE - 1) // SECTOR_SIZE - end_addr = blocks * SECTOR_SIZE + start_addr + ret = dev.recv_data(7, timeout=1000) # erase takes usually a bit longer + unpack_pkt(ret) + print("Erase complete") + +def read_img(dev, img, start_addr, size): - if (start_addr > 0xFF800): # for RA4 series - raise ValueError("start address value error") - if (end_addr <= start_addr or end_addr > 0xFF800): - raise ValueError("end address value error") + if size == None: + size = 0x3FFFF - start_addr # read maximum possible + (start_addr, end_addr) = set_size_boundaries(start_addr, size) + # setup initial communication SAD = int_to_hex_list(start_addr) EAD = int_to_hex_list(end_addr) @@ -84,8 +106,8 @@ def read_img(dev, img, start_addr, end_addr): # calculate how many packets are have to be received nr_packet = (end_addr - start_addr) // 1024 # TODO: set other than just 1024 - with open('output.bin', 'wb') as f: - for i in tqdm(range(0, nr_packet+1), desc="Reading progess"): + with open(img, 'wb') as f: + for i in tqdm(range(0, nr_packet+1), desc="Reading progress"): ret = dev.recv_data(1024 + 6) chunk = unpack_pkt(ret) chunky = bytes(int(x, 16) for x in chunk) @@ -94,43 +116,37 @@ def read_img(dev, img, start_addr, end_addr): dev.send_data(packed) -def write_img(dev, img, start_addr, end_addr, verify=False): +def write_img(dev, img, start_addr, size, verify=False): if os.path.exists(img): file_size = os.path.getsize(img) else: raise Exception(f'file {img} does not exist') - # calculate / check start and end address - if start_addr == None or end_addr == None: - if start_addr == None: - start_addr = 0 - # align start addr - if start_addr % SECTOR_SIZE: - raise ValueError(f"start addr not aligned on sector size {SECTOR_SIZE}") - blocks = (file_size + SECTOR_SIZE - 1) // SECTOR_SIZE - end_addr = blocks * SECTOR_SIZE + start_addr - 1 + if size == None: + size = file_size + + if size > file_size: + raise ValueError("Write size > file size") + + (start_addr, end_addr) = set_size_boundaries(start_addr, size) - chunk_size = 1024 # max is 1024 - #if (start_addr > 0xFF800): # for RA4 series - # raise ValueError("start address value error") - #if (end_addr <= start_addr or end_addr > 0xFF800): - # raise ValueError("end address value error") + chunk_size = 1024 # max is 1024 according to protocol # setup initial communication SAD = int_to_hex_list(start_addr) EAD = int_to_hex_list(end_addr) - #packed = pack_pkt(ERA_CMD, SAD + EAD) # actually works packed = pack_pkt(WRI_CMD, SAD + EAD) dev.send_data(packed) ret = dev.recv_data(7) unpack_pkt(ret) + totalread = 0 with open(img, 'rb') as f: - with tqdm(total=file_size, desc="Sending chunks") as pbar: + with tqdm(total=size, desc="Writing progress") as pbar: chunk = f.read(chunk_size) pbar.update(len(chunk)) - while chunk: + while chunk and totalread < size: if len(chunk) != chunk_size: padding_length = chunk_size - len(chunk) chunk += b'\0' * padding_length @@ -140,8 +156,19 @@ def write_img(dev, img, start_addr, end_addr, verify=False): reply = dev.recv_data(reply_len) msg = unpack_pkt(reply) chunk = f.read(chunk_size) + totalread += chunk_size pbar.update(len(chunk)) + + if verify: + with tempfile.NamedTemporaryFile(prefix='.hidden_', delete=False) as tmp_file, open(img, 'rb') as cmp_file: + read_img(dev, tmp_file.name, start_addr, size) + c1 = tmp_file.read(file_size) # due to byte alignment read file is longer + c2 = cmp_file.read() + if c1 == c2: + print("Verify complete") + else: + print("Verify failed") def main(): parser = argparse.ArgumentParser(description="RA Flasher Tool") @@ -150,39 +177,37 @@ def main(): # Subparser for the write command write_parser = subparsers.add_parser("write", help="Write data to flash") - write_parser.add_argument("--start_address", type=int, default=0x0000, help="Start address") - write_parser.add_argument("--end_address", type=int, help="End address") + write_parser.add_argument("--start_address", type=hex_type, default='0x0000', help="Start address") + write_parser.add_argument("--size", type=hex_type, default=None, help="Size in bytes") write_parser.add_argument("--verify", action="store_true", help="Verify after writing") write_parser.add_argument("file_name", type=str, help="File name") # Subparser for the read command read_parser = subparsers.add_parser("read", help="Read data from flash") - read_parser.add_argument("--start_address", type=int, default=0x000, help="Start address") - read_parser.add_argument("--size", type=int, default=1024, help="Size in bytes") + read_parser.add_argument("--start_address", type=hex_type, default='0x0000', help="Start address") + read_parser.add_argument("--size", type=hex_type, default=None, help="Size in bytes") read_parser.add_argument("file_name", type=str, help="File name") + erase_parser = subparsers.add_parser("erase", help="Erase sectors") + erase_parser.add_argument("--start_address", default='0x0000', type=hex_type, help="Start address") + erase_parser.add_argument("--size", type=hex_type, help="Size") + # Subparser for the info command subparsers.add_parser("info", help="Show flasher information") args = parser.parse_args() if args.command == "write": - dev = RAConnect(vendor_id=0x045B, product_id=0x0261) - status_con = inquire_connection(dev) - if not status_con: - dev.confirm_connection() - write_img(dev, "src/sample.bin", 0x8000, None) + dev = RAConnect(VENDOR_ID, PRODUCT_ID) + write_img(dev, args.file_name, args.start_address, args.size, args.verify) elif args.command == "read": - dev = RAConnect(vendor_id=0x045B, product_id=0x0261) - status_con = inquire_connection(dev) - if not status_con: - dev.confirm_connection() - read_img(dev, "save.bin", 0x0000, 0x3FFFF) + dev = RAConnect(VENDOR_ID, PRODUCT_ID) + read_img(dev, args.file_name, args.start_address, args.size) + elif args.command == "erase": + dev = RAConnect(VENDOR_ID, PRODUCT_ID) + erase_chip(dev, args.start_address, args.size) elif args.command == "info": - dev = RAConnect(vendor_id=0x045B, product_id=0x0261) - status_con = inquire_connection(dev) - if not status_con: - dev.confirm_connection() + dev = RAConnect(VENDOR_ID, PRODUCT_ID) get_dev_info(dev) get_area_info(dev) else: