From 55dcee16c310c0833a4d7d8b4c6c8292f8063a51 Mon Sep 17 00:00:00 2001 From: Mateusz Karlic Date: Thu, 22 Sep 2022 14:41:05 +0200 Subject: [PATCH] json2renode: Use spiflash->base instead of flash_boot_address --- litex/tools/litex_json2renode.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/litex/tools/litex_json2renode.py b/litex/tools/litex_json2renode.py index d5e6e2050..c07f909c6 100755 --- a/litex/tools/litex_json2renode.py +++ b/litex/tools/litex_json2renode.py @@ -811,16 +811,16 @@ connector Connect ethmac switch connector Connect host.tap switch """.format(args.configure_network) elif flash_binaries: - if 'flash_boot_address' not in csr['constants']: + if 'spiflash' not in csr['memories']: print('Warning! There is no flash memory to load binaries to') else: # load binaries to spiflash to boot from there for offset in flash_binaries: path = flash_binaries[offset] - flash_boot_address = int(csr['constants']['flash_boot_address'], 0) + offset + flash_boot_address = int(csr['memories']['spiflash']['base']) + offset - firmware_data = open(path, 'rb').read() + firmware_data = open(os.path.expanduser(path), 'rb').read() crc32 = zlib.crc32(firmware_data) result += 'sysbus WriteDoubleWord {} {}\n'.format(hex(flash_boot_address), hex(len(firmware_data)))