m-labs · Apr 18, 2014 · Apr 18, 2014
Showing with 35 additions and 177 deletions.

+19 −0 crc.py

+12 −0 mkmscimg.py

+1 −2 software/bios/Makefile

+1 −1 software/videomixer/Makefile

+2 −2 tools/Makefile

+0 −172 tools/mkmscimg.c
diff --git a/crc.py b/crc.py
@@ -0,0 +1,19 @@
+import binascii
+
+def insert_crc(i_filename, fbi_mode=False, o_filename=None):
+	if o_filename is None:
+		o_filename = i_filename
+
+	with open(i_filename, 'rb') as f:
+		fdata = f.read()
+	fcrc = binascii.crc32(fdata).to_bytes(4, byteorder="big")
+	flength = len(fdata).to_bytes(4, byteorder="big")
+
+	with open(o_filename, 'wb') as f:
+		if fbi_mode:
+			f.write(flength)
+			f.write(fcrc)
+			f.write(fdata)
+		else:
+			f.write(fdata)
+			f.write(fcrc)
diff --git a/mkmscimg.py b/mkmscimg.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python3
+
+import argparse
+import crc
+
+if __name__ == "__main__":
+	parser = argparse.ArgumentParser(description="CRC32 computation tool and MiSoC image file writer.")
+	parser.add_argument("input", help="input file")
+	parser.add_argument("-o", "--output", default=None, help="output file (if not specified, use input file)")
+	parser.add_argument("-f", "--fbi", default=False, action="store_true", help="build flash boot image (FBI) file")
+	args = parser.parse_args()
+	crc.insert_crc(args.input, args.fbi, args.output)
diff --git a/software/bios/Makefile b/software/bios/Makefile
@@ -9,10 +9,9 @@ all: bios.bin
 -include $(OBJECTS:.o=.d)
 
 %.bin: %.elf
-	$(MAKE) -C $(MSCDIR)/tools
 	$(OBJCOPY) -O binary $< $@
 	chmod -x $@
-	$(MSCDIR)/tools/mkmscimg $@ write
+	$(MSCDIR)/mkmscimg.py $@
 
 bios.elf: linker.ld $(OBJECTS) libs
 

diff --git a/software/videomixer/Makefile b/software/videomixer/Makefile
@@ -13,7 +13,7 @@ all: videomixer.bin videomixer.fbi
 	chmod -x $@
 
 %.fbi: %.bin
-	$(MSCDIR)/tools/mkmscimg $< write $@
+	$(MSCDIR)/mkmscimg.py -f -o $@ $<
 
 videomixer.elf: $(OBJECTS) libs
 

diff --git a/tools/Makefile b/tools/Makefile
@@ -1,4 +1,4 @@
-TARGETS=mkmscimg flterm byteswap
+TARGETS=flterm byteswap
 CC=gcc
 RM ?= rm -f
 
@@ -7,7 +7,7 @@ all: $(TARGETS)
 %: %.c
 	$(CC) -O2 -Wall -I../common -s -o $@ $<
 
-install: mkmscimg flterm
+install: flterm
 	install -d /usr/local/bin
 	install -m755 -t /usr/local/bin $^
 

diff --git a/tools/mkmscimg.c b/tools/mkmscimg.c