deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #630 from blemmens/z1-bsl-far-memory-support

Browse source 
Added support to program Z1 far memory with BSL
This commit is contained in:
Nicolas Tsiftes 2014-04-30 00:59:51 +02:00
parent dbe83c42ab 7b5ed1d1b0
commit 953312cbb7
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tools/z1/z1-bsl-nopic
View file

@ -234,6 +234,7 @@ class LowLevel:
BSL_ERASE = 0x16 #Erase one segment BSL_ERASE = 0x16 #Erase one segment
BSL_MERAS = 0x18 #Erase complete FLASH memory BSL_MERAS = 0x18 #Erase complete FLASH memory
BSL_CHANGEBAUD = 0x20 #Change baudrate BSL_CHANGEBAUD = 0x20 #Change baudrate
BSL_SETMEMOFFSET = 0x21 #Set memory offset
BSL_LOADPC = 0x1A #Load PC and start execution BSL_LOADPC = 0x1A #Load PC and start execution
BSL_TXVERSION = 0x1E #Get BSL version BSL_TXVERSION = 0x1E #Get BSL version
@ -806,6 +807,7 @@ class Memory:
segmentdata = [] segmentdata = []
currentAddr = 0 currentAddr = 0
startAddr = 0 startAddr = 0
offsetAddr = 0
lines = file.readlines() lines = file.readlines()
for l in lines: for l in lines:
if l[0] != ':': raise BSLException("File Format Error\n") if l[0] != ':': raise BSLException("File Format Error\n")
@ -815,21 +817,32 @@ class Memory:
type = int(l[7:9],16) type = int(l[7:9],16)
check = int(l[-2:],16) check = int(l[-2:],16)
if type == 0x00: if type == 0x00:
if currentAddr != address: if currentAddr != offsetAddr + address:
if segmentdata: if segmentdata:
self.segments.append( Segment(startAddr, string.join(segmentdata,'')) ) self.segments.append( Segment(startAddr, string.join(segmentdata,'')) )
startAddr = currentAddr = address startAddr = currentAddr = offsetAddr + address
segmentdata = [] segmentdata = []
for i in range(length): for i in range(length):
segmentdata.append( chr(int(l[9+2*i:11+2*i],16)) ) segmentdata.append( chr(int(l[9+2*i:11+2*i],16)) )
currentAddr = length + currentAddr currentAddr = length + currentAddr
elif type in (0x01, 0x02, 0x03, 0x04, 0x05): elif type == 0x02:
if segmentdata:
self.segments.append( Segment(startAddr, string.join(segmentdata,'')) )
offsetAddr = int(l[9:13],16)*16
startAddr = currentAddr = offsetAddr
segmentdata = []
elif type in (0x01, 0x03, 0x04, 0x05):
pass pass
else: else:
sys.stderr.write("Ignored unknown field (type 0x%02x) in ihex file.\n" % type) sys.stderr.write("Ignored unknown field (type 0x%02x) in ihex file.\n" % type)
if segmentdata: if segmentdata:
self.segments.append( Segment(startAddr, string.join(segmentdata,'')) ) self.segments.append( Segment(startAddr, string.join(segmentdata,'')) )
if DEBUG:
sys.stderr.write("loadIHex\n")
for segment in self.segments:
sys.stderr.write(" Segment(startadress = 0x%04x, len = %i)\n" % (segment.startaddress, len(segment)))
def loadTIText(self, file): def loadTIText(self, file):
"""load data from a (opened) file in TI-Text format""" """load data from a (opened) file in TI-Text format"""
next = 1 next = 1
@ -1012,6 +1025,11 @@ class BootStrapLoader(LowLevel):
if DEBUG > 1: sys.stderr.write("* programData()\n") if DEBUG > 1: sys.stderr.write("* programData()\n")
for seg in segments: for seg in segments:
currentAddr = seg.startaddress currentAddr = seg.startaddress
offsetAddr = 0
if (seg.startaddress > 0xFFFF):
offsetAddr = seg.startaddress >> 16
self.bslTxRx(self.BSL_SETMEMOFFSET, 0, offsetAddr)
currentAddr = currentAddr - (offsetAddr << 16)
pstart = 0 pstart = 0
while pstart<len(seg.data): while pstart<len(seg.data):
length = self.MAXDATA length = self.MAXDATA