From f7ced7a8232e0af247b5d66000ca9bd8c4e8fc8a Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Tue, 25 Aug 2015 14:56:50 -0700 Subject: [PATCH] Support Python 3.x in make_spi_image.py. --- firmware/tools/make_spi_image.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/firmware/tools/make_spi_image.py b/firmware/tools/make_spi_image.py index a1dc6b1c5..3c1754c99 100755 --- a/firmware/tools/make_spi_image.py +++ b/firmware/tools/make_spi_image.py @@ -73,8 +73,8 @@ images = ( } ) -spi_image = [] -spi_image_default_byte = '\xff' +spi_image = bytearray() +spi_image_default_byte = bytearray((255,)) for image in images: if len(image['data']) > image['size']: @@ -83,7 +83,6 @@ for image in images: padded_data = image['data'] + (spi_image_default_byte * pad_size) spi_image += padded_data -spi_image = ''.join(spi_image) if len(spi_image) > spi_size: raise RuntimeError('SPI flash image size of %d exceeds device size of %d bytes' % (len(spi_image), spi_size))