X-Git-Url: https://robinkrens.nl/gitweb/?a=blobdiff_plain;f=src%2FRAFlasher.py;h=025bee48f9b3e34592c0321d56dee549decd4dd6;hb=5bc6b530d89045f25e246d471fbb7deb70e7f10c;hp=4ec729de74a43cb32562813adb7460648c43c25f;hpb=f15385d38fa70f20f1d7ad4e8b30ce8728da4d57;p=renesas-ra-flasher diff --git a/src/RAFlasher.py b/src/RAFlasher.py index 4ec729d..025bee4 100644 --- a/src/RAFlasher.py +++ b/src/RAFlasher.py @@ -8,6 +8,8 @@ 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 @@ -40,16 +42,6 @@ def set_size_boundaries(start_addr, size): return (start_addr, end_addr) -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 get_area_info(dev): for i in [0,1,2]: packed = pack_pkt(ARE_CMD, [str(i)]) @@ -80,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) @@ -134,7 +130,6 @@ def write_img(dev, img, start_addr, size, verify=False): raise ValueError("Write size > file size") (start_addr, end_addr) = set_size_boundaries(start_addr, size) - print(start_addr, end_addr) chunk_size = 1024 # max is 1024 according to protocol @@ -146,11 +141,12 @@ def write_img(dev, img, start_addr, size, verify=False): ret = dev.recv_data(7) unpack_pkt(ret) + totalread = 0 with open(img, 'rb') as f: - with tqdm(total=file_size, desc="Writing progress") 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 @@ -160,12 +156,13 @@ def write_img(dev, img, start_addr, size, 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, end_addr) + 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: @@ -191,29 +188,26 @@ def main(): 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() - #print(args.start_address, args.size) + 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, args.file_name, 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: