X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=frprog.py;h=a92b0fb9f2a5af2a776485151c5bebb997ee806e;hb=b580c9fce4cc4e51d411e09eff79af6c17519600;hp=f6a741846fe4bcd2798e1225edae2a4abd61eca2;hpb=254be031fd624c96ae36205a2bf33d2a45e5f781;p=pyfrprog.git

diff --git a/frprog.py b/frprog.py
index f6a7418..a92b0fb 100755
--- a/frprog.py
+++ b/frprog.py
@@ -6,8 +6,10 @@ from SerialPort_linux import *
 DEVICE="/dev/ttyUSB0"
 # baudrate used for initialization
 INIT_BAUDRATE=9600
-# baudrate used for communication after init
-REAL_BAUDRATE=38400
+# baudrate used for communication with the internal bootloader after init
+BOOTLOADER_BAUDRATE=38400
+# baudrate used for communication with the pkernel program that does the flashing eventually
+KERNEL_BAUDRATE=115200
 
 # contains the last received checksum from a READ, WRITE or CHECKSUM command
 last_checksum = 0
@@ -15,7 +17,6 @@ last_checksum = 0
 def sendByte(byte):
 	time.sleep(0.001) # just to get sure, wait 1ms
 	tty.write(chr(byte))
-	tty.flush()
 
 def sendWord(word):
 	sendByte(word & 0xFF)
@@ -98,8 +99,6 @@ def cmdCHECKSUM():
 	recvChecksum()
 
 def cmdBAUDRATE(baudrate):
-	global last_checksum
-
 	# send BAUDRATE command
 	sendByte(0x01)
 	if (recvByte() != 0xF1):
@@ -108,68 +107,101 @@ def cmdBAUDRATE(baudrate):
 	if (recvByte() != 0x86):
 		raise Exception
 	# send desired baudrate
-	sendByte(baudrate & 0xFF)
-	sendByte((baudrate >> 8) & 0xFF)
-	sendByte((baudrate >> 16) & 0xFF)
-	sendByte((baudrate >> 24) & 0xFF)
+	sendDWord(baudrate)
+
+def pkernCHIPERASE():
+	sendByte(0x15)
+	if (recvByte() != 0x45):
+		raise Exception
+	# wait till completion...
+	if (recvByte() != 0x23):
+		raise Exception
+
+def pkernERASE(address, size):
+	sendByte(0x12)
+	if (recvByte() != 0x11):
+		raise Exception
+	sendDWord(address)
+	sendWord(size)
+	if (recvByte() != 0x18):
+		raise Exception
+
+
+def pkernWRITE(address, size, data):
+	# send WRITE command
+	sendByte(0x13)
+	if (recvByte() != 0x37):
+		raise Exception
+	# tell desired address and size
+	sendDWord(address)
+	sendWord(size)
+
+	# write binary stream of data
+	for i in range(0, size):
+		sendByte(data[i])
+
+	if (recvByte() != 0x28):
+		raise Exception
+
 
 class FlashSequence(object):
 	def __init__(self, address, data):
 		self.address = address
 		self.data = data
 
-flashseqs = []
+def readMHXFile(filename): # desired mhx filename
+	fp = open(filename, "r")
+	retval = [] # returns a list of FlashSequence objects
+	linecount = 0
+	for line in fp:
+		linecount += 1
+		# get rid of newline characters
+		line = line.strip()
+
+		# we're only interested in S2 (data sequence with 3 address bytes) records by now
+		if line[0:2] == "S2":
+			byte_count = int(line[2:4], 16)
+			# just to get sure, check if byte count field is valid
+			if (len(line)-4) != (byte_count*2):
+				print sys.argv[0] + ": Warning - inavlid byte count field in " + \
+					sys.argv[1] + ":" + str(linecount) + ", skipping line!"
+				continue
+
+			# address and checksum bytes are not needed
+			byte_count -= 4
+			address = int(line[4:10], 16)
+			datastr = line[10:10+byte_count*2]
+
+			# convert data hex-byte-string to real byte data list
+			data = []
+			for i in range(0, len(datastr)/2):
+				data.append(int(datastr[2*i:2*i+2], 16))
+
+			# add flash sequence to our list
+			retval.append(FlashSequence(address, data))
+	fp.close()
+	return retval
+
 
 # check command line arguments
-if len(sys.argv) != 2:
-	print "Usage: " + sys.argv[0] + " [mhx-file]"
+if len(sys.argv) != 3:
+	print "Usage: " + sys.argv[0] + " [pkernel mhx-file] [target mhx-file]"
 	sys.exit(1)
 
-# read in data from mhx-file before starting
+# read in data from mhx-files before starting
 try:
-	fp = open(sys.argv[1], "r")
-except IOError:
-	print sys.argv[0] + ": Error - couldn't open file " + sys.argv[1] + "!"
+	bootloaderseqs = readMHXFile(sys.argv[1])
+	pkernelseqs = readMHXFile(sys.argv[2])
+except IOError as error:
+	print sys.argv[0] + ": Error - couldn't open file " + error.filename + "!"
 	sys.exit(1)
 
-linecount = 0
-for line in fp:
-	linecount += 1
-	# get rid of newline characters
-	line = line.strip()
-
-	# we're only interested in S2 (data sequence with 3 address bytes) records by now
-	if line[0:2] == "S2":
-		byte_count = int(line[2:4], 16)
-		# just to get sure, check if byte count field is valid
-		if (len(line)-4) != (byte_count*2):
-			print sys.argv[0] + ": Warning - inavlid byte count field in " + \
-				sys.argv[1] + ":" + str(linecount) + ", skipping line!"
-			continue
-
-		# address and checksum bytes are not needed
-		byte_count -= 4
-		address = int(line[4:10], 16)
-		datastr = line[10:10+byte_count*2]
-
-		# convert data hex-byte-string to real byte data list
-		data = []
-		for i in range(0, len(datastr)/2):
-			data.append(int(datastr[2*i:2*i+2], 16))
-
-		# add flash sequence to our list
-		flashseqs.append(FlashSequence(address, data))
-
-print "The following flash sequences have been read in:"
-for seq in flashseqs:
-	print hex(seq.address) + ":", seq.data
-
 print "Initializing serial port..."
 tty = SerialPort(DEVICE, 100, INIT_BAUDRATE)
 
-print "Please press RESET on your 1337 board..."
+print "Please press RESET on your board..."
 
-while 1:
+while True:
 	tty.write('V')
 	tty.flush()
 	try: 
@@ -181,10 +213,51 @@ while 1:
 
 print "OK, trying to set baudrate..."
 # set baudrate
-cmdBAUDRATE(REAL_BAUDRATE)
-tty = SerialPort(DEVICE, 100, REAL_BAUDRATE)
+cmdBAUDRATE(BOOTLOADER_BAUDRATE)
+tty = SerialPort(DEVICE, 100, BOOTLOADER_BAUDRATE)
+
+print "Transfering pkernel program to IRAM",
+# let the fun begin!
+for seq in bootloaderseqs:
+	if(seq.address <= 0x40000):
+		addr = seq.address
+	else:
+		continue
+	#print "RAMing", len(seq.data), "bytes at address", hex(addr)
+	cmdWRITE(addr, len(seq.data), seq.data)
+	tty.flush()
+	sys.stdout.write(".")
+	sys.stdout.flush()
+print
+
+# execute our pkernel finally and set pkernel conform baudrate
+cmdCALL(0x30000)
+time.sleep(0.5) # just to get sure that the pkernel is really running!
+del tty
+tty = SerialPort(DEVICE, None, KERNEL_BAUDRATE)
+
+print "Performing ChipErase..."
+pkernCHIPERASE()
+print "Chip erasing done."
+
+print "Flashing",
+for seq in pkernelseqs:
+	# skip seqs only consisting of 0xffs
+	seqset = list(set(seq.data))
+	if len(seqset) == 1 and seqset[0] == 0xff:
+		continue
+	#print "Flashing", len(seq.data), "bytes at address", hex(seq.address)
+	pkernWRITE(seq.address, len(seq.data), seq.data)
+	tty.flush()
+	sys.stdout.write(".")
+	sys.stdout.flush()
+print
+print "Flashing done."
 
+sendByte(0x97) # exit and restart
+print "Program was started. Have fun!"
 
+# some tests here.......
 """
 # execute (existing) program in ram
 cmdCALL(0x00033ffc)
@@ -262,7 +335,7 @@ print "Received Checksum:", last_checksum
 print
 """
 
-
+"""
 # write some data in the iram and try to execute it
 data_wr =[
 		0x9B,0x00,
@@ -286,3 +359,4 @@ cmdWRITE(0x00030000, len(data_wr), data_wr)
 print "Received Checksum:", last_checksum
 print
 cmdCALL(0x00030000)
+"""