Skip to content

Fix NEORV32 programmer for updated bootloader behavior #567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uio-uio wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix NEORV32 programmer for updated bootloader behavior #567

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 27 additions & 14 deletions software/chipwhisperer/hardware/naeusb/programmer_neorv32.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import struct
import time
import traceback
import binascii
from datetime import datetime
from .programmer_targetfpga import LatticeICE40
from functools import reduce, wraps
Expand All @@ -35,34 +36,35 @@

import warnings
def gen_app_binary(rom):
"""Replicate image_gen.c from the neorv32 project
"""
"""Replicate image_gen.c from the neorv32 project (OP_EXE)"""

#
with warnings.catch_warnings():
warnings.simplefilter("ignore")
signature = 0x4788CAFE
if not isinstance(rom, bytes):
signature = 0xB007C0DE # same as image_gen.c

if not isinstance(rom, (bytes, bytearray)):
rom = rom.read()

checksum = np.uint32(0)
size = 0
size = len(rom) # raw_exe_size in BYTES (exactly like image_gen.c)

# NOTE: image_gen.c warns if size%4 != 0 but still processes full 32-bit reads.
# Here we assume rom length is multiple of 4 (recommended).
for i in range(0, len(rom), 4):
tmp = rom[i]
tmp |= (rom[i+1] << 8)
tmp |= (rom[i+2] << 16)
tmp |= (rom[i+3] << 24)
checksum += np.uint32(tmp)
# checksum &= 0xFFFFFFFF
size += 4

checksum = (~checksum) + 1
checksum = ~checksum # SAME as image_gen.c (one's complement)

new_rom = bytes([(signature >> (i*8)) & 0xFF for i in range(4)])
new_rom += bytes([(size >> (i*8)) & 0xFF for i in range(4)])
new_rom += bytes([(checksum >> (i*8)) & 0xFF for i in range(4)])
new_rom += bytes([(int(checksum) >> (i*8)) & 0xFF for i in range(4)])
new_rom += rom
return new_rom



def print_fun(s):
Expand Down Expand Up @@ -220,27 +222,38 @@ def program(self, romfilename, bsfile=None, check_rom_size=True):
self.load_ice40(bsfile)

# This time might need to be longer or adjusted on certain builds - TODO test
time.sleep(0.2)
time.sleep(0.3)

# Log startup message
start_msg = bytes(self.sp.read())
target_logger.debug(b"Start Message from Bootlader: " + start_msg)

# Check the menu worked
self.do_cmd("h", expected="Available CMDs:\r\n h: Help\r\n r: Restart\r\n u: Upload\r\n")

self.sp.write(b" ")
time.sleep(0.5)
self.do_cmd("h", expected="Available CMDs:")

# Upload
self.do_cmd("u", "Awaiting neorv32_exe.bin... ")
new_rom = gen_app_binary(romdata)

#Check the header
#print("first4 =", new_rom[:4].hex())
#print("sig =", hex(int.from_bytes(new_rom[:4], "little")))
#print("size =", int.from_bytes(new_rom[4:8], "little"))
#print("csum =", hex(int.from_bytes(new_rom[8:12], "little")))
#print("total =", len(new_rom))

self.sp.write(new_rom)

time.sleep(0.1)
resp = bytes(self.sp.read())


target_logger.debug(b"Response to upload of data: " + resp)

if b"OK" not in resp:
raise IOError(b"Upload failed - bootloader responded with " + resp)

boot_resp = self.do_cmd("e", expected="Booting", resp_read_len=13)