Changed '_flash' targets to only write used segments. (#9217)
Changed '_flash' targets to only write used segments.
This commit is contained in:
Michael Keller
GitHub
commit
e9b94deee5
12
Makefile
12
Makefile
|
|
@ -225,6 +225,7 @@ CROSS_GDB := $(ARM_SDK_PREFIX)gdb
|
|||
OBJCOPY := $(ARM_SDK_PREFIX)objcopy
|
||||
OBJDUMP := $(ARM_SDK_PREFIX)objdump
|
||||
SIZE := $(ARM_SDK_PREFIX)size
|
||||
DFUSE-PACK := src/utils/dfuse-pack.py
|
||||
|
||||
#
|
||||
# Tool options.
|
||||
|
|
@ -305,6 +306,7 @@ CPPCHECK = cppcheck $(CSOURCES) --enable=all --platform=unix64 \
|
|||
TARGET_S19 = $(BIN_DIR)/$(FORKNAME)_$(FC_VER)_$(TARGET).s19
|
||||
TARGET_BIN = $(BIN_DIR)/$(FORKNAME)_$(FC_VER)_$(TARGET).bin
|
||||
TARGET_HEX = $(BIN_DIR)/$(FORKNAME)_$(FC_VER)_$(TARGET).hex
|
||||
TARGET_DFU = $(BIN_DIR)/$(FORKNAME)_$(FC_VER)_$(TARGET).dfu
|
||||
TARGET_ELF = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET).elf
|
||||
TARGET_EXST_ELF = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET)_EXST.elf
|
||||
TARGET_UNPATCHED_BIN = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET)_UNPATCHED.bin
|
||||
|
|
@ -319,6 +321,7 @@ CLEAN_ARTIFACTS := $(TARGET_BIN)
|
|||
CLEAN_ARTIFACTS += $(TARGET_HEX)
|
||||
CLEAN_ARTIFACTS += $(TARGET_ELF) $(TARGET_OBJS) $(TARGET_MAP)
|
||||
CLEAN_ARTIFACTS += $(TARGET_LST)
|
||||
CLEAN_ARTIFACTS += $(TARGET_DFU)
|
||||
|
||||
# Make sure build date and revision is updated on every incremental build
|
||||
$(OBJECT_DIR)/$(TARGET)/build/version.o : $(SRC)
|
||||
|
|
@ -343,6 +346,10 @@ $(TARGET_HEX): $(TARGET_ELF)
|
|||
@echo "Creating HEX $(TARGET_HEX)" "$(STDOUT)"
|
||||
$(V1) $(OBJCOPY) -O ihex --set-start 0x8000000 $< $@
|
||||
|
||||
$(TARGET_DFU): $(TARGET_HEX)
|
||||
@echo "Creating DFU $(TARGET_DFU)" "$(STDOUT)"
|
||||
$(V1) $(DFUSE-PACK) -i $< $@
|
||||
|
||||
else
|
||||
CLEAN_ARTIFACTS += $(TARGET_UNPATCHED_BIN) $(TARGET_EXST_HASH_SECTION_FILE) $(TARGET_EXST_ELF)
|
||||
|
||||
|
|
@ -510,7 +517,7 @@ TARGETS_FLASH = $(addsuffix _flash,$(VALID_TARGETS) )
|
|||
|
||||
## <TARGET>_flash : build and flash a target
|
||||
$(TARGETS_FLASH):
|
||||
$(V0) $(MAKE) binary hex TARGET=$(subst _flash,,$@)
|
||||
$(V0) $(MAKE) hex TARGET=$(subst _flash,,$@)
|
||||
ifneq (,$(findstring /dev/ttyUSB,$(SERIAL_DEVICE)))
|
||||
$(V0) $(MAKE) tty_flash TARGET=$(subst _flash,,$@)
|
||||
else
|
||||
|
|
@ -530,7 +537,8 @@ ifneq (no-port-found,$(SERIAL_DEVICE))
|
|||
$(V0) echo -n 'R' > $(SERIAL_DEVICE)
|
||||
$(V0) sleep 1
|
||||
endif
|
||||
$(V0) dfu-util -a 0 -D $(TARGET_BIN) -s 0x08000000:leave
|
||||
$(V0) $(MAKE) $(TARGET_DFU)
|
||||
$(V0) dfu-util -a 0 -D $(TARGET_DFU) -s :leave
|
||||
|
||||
st-flash_$(TARGET): $(TARGET_BIN)
|
||||
$(V0) st-flash --reset write $< 0x08000000
|
||||
|
|
|
|||
|
|
@ -0,0 +1,213 @@
|
|||
#!/usr/bin/python
|
||||
|
||||
# Written by Antonio Galea - 2010/11/18
|
||||
# Distributed under Gnu LGPL 3.0
|
||||
# see http://www.gnu.org/licenses/lgpl-3.0.txt
|
||||
#
|
||||
# based on a modified version of this script from https://sourceforge.net/p/dfu-util/tickets/35/#357c
|
||||
# with the patch supplied in https://sourceforge.net/p/dfu-util/tickets/35/#a2b6
|
||||
|
||||
import sys,struct,zlib,os
|
||||
import binascii
|
||||
from optparse import OptionParser
|
||||
from intelhex import IntelHex
|
||||
|
||||
DEFAULT_DEVICE="0x0483:0xdf11"
|
||||
DEFAULT_NAME=b'ST...'
|
||||
|
||||
def named(tuple,names):
|
||||
return dict(list(zip(names.split(),tuple)))
|
||||
def consume(fmt,data,names):
|
||||
n = struct.calcsize(fmt)
|
||||
return named(struct.unpack(fmt,data[:n]),names),data[n:]
|
||||
def cstring(bytestring):
|
||||
return bytestring.partition(b'\0')[0]
|
||||
def compute_crc(data):
|
||||
return 0xFFFFFFFF & -zlib.crc32(data) -1
|
||||
|
||||
def parse(file,dump_images=False):
|
||||
print('File: "%s"' % file)
|
||||
data = open(file,'rb').read()
|
||||
crc = compute_crc(data[:-4])
|
||||
prefix, data = consume('<5sBIB',data,'signature version size targets')
|
||||
print('%(signature)s v%(version)d, image size: %(size)d, targets: %(targets)d' % prefix)
|
||||
for t in range(prefix['targets']):
|
||||
tprefix, data = consume('<6sBI255s2I',data,'signature altsetting named name size elements')
|
||||
tprefix['num'] = t
|
||||
if tprefix['named']:
|
||||
tprefix['name'] = cstring(tprefix['name'])
|
||||
else:
|
||||
tprefix['name'] = ''
|
||||
print('%(signature)s %(num)d, alt setting: %(altsetting)s, name: "%(name)s", size: %(size)d, elements: %(elements)d' % tprefix)
|
||||
tsize = tprefix['size']
|
||||
target, data = data[:tsize], data[tsize:]
|
||||
for e in range(tprefix['elements']):
|
||||
eprefix, target = consume('<2I',target,'address size')
|
||||
eprefix['num'] = e
|
||||
print(' %(num)d, address: 0x%(address)08x, size: %(size)d' % eprefix)
|
||||
esize = eprefix['size']
|
||||
image, target = target[:esize], target[esize:]
|
||||
if dump_images:
|
||||
out = '%s.target%d.image%d.bin' % (file,t,e)
|
||||
open(out,'wb').write(image)
|
||||
print(' DUMPED IMAGE TO "%s"' % out)
|
||||
if len(target):
|
||||
print("target %d: PARSE ERROR" % t)
|
||||
suffix = named(struct.unpack('<4H3sBI',data[:16]),'device product vendor dfu ufd len crc')
|
||||
print('usb: %(vendor)04x:%(product)04x, device: 0x%(device)04x, dfu: 0x%(dfu)04x, %(ufd)s, %(len)d, 0x%(crc)08x' % suffix)
|
||||
if crc != suffix['crc']:
|
||||
print("CRC ERROR: computed crc32 is 0x%08x" % crc)
|
||||
data = data[16:]
|
||||
if data:
|
||||
print("PARSE ERROR")
|
||||
|
||||
def checkbin(binfile):
|
||||
data = open(binfile,'rb').read()
|
||||
if (len(data) < 16):
|
||||
return
|
||||
crc = compute_crc(data[:-4])
|
||||
suffix = named(struct.unpack('<4H3sBI',data[-16:]),'device product vendor dfu ufd len crc')
|
||||
if crc == suffix['crc'] and suffix['ufd'] == b'UFD':
|
||||
print('usb: %(vendor)04x:%(product)04x, device: 0x%(device)04x, dfu: 0x%(dfu)04x, %(ufd)s, %(len)d, 0x%(crc)08x' % suffix)
|
||||
print("It looks like the file %s has a DFU suffix!" % binfile)
|
||||
print("Please remove any DFU suffix and retry.")
|
||||
sys.exit(1)
|
||||
|
||||
def build(file,targets,name=DEFAULT_NAME,device=DEFAULT_DEVICE):
|
||||
data = b''
|
||||
for t,target in enumerate(targets):
|
||||
tdata = b''
|
||||
for image in target:
|
||||
tdata += struct.pack('<2I',image['address'],len(image['data']))+image['data']
|
||||
tdata = struct.pack('<6sBI255s2I',b'Target',0,1,name,len(tdata),len(target)) + tdata
|
||||
data += tdata
|
||||
data = struct.pack('<5sBIB',b'DfuSe',1,len(data)+11,len(targets)) + data
|
||||
v,d=[int(x,0) & 0xFFFF for x in device.split(':',1)]
|
||||
data += struct.pack('<4H3sB',0x2200,d,v,0x011a,b'UFD',16)
|
||||
crc = compute_crc(data)
|
||||
data += struct.pack('<I',crc)
|
||||
open(file,'wb').write(data)
|
||||
|
||||
if __name__=="__main__":
|
||||
usage = """
|
||||
%prog [-d|--dump] infile.dfu
|
||||
%prog {-b|--build} address:file.bin [-b address:file.bin ...] [{-D|--device}=vendor:device] outfile.dfu
|
||||
%prog {-s|--build-s19} file.s19 [{-D|--device}=vendor:device] outfile.dfu
|
||||
%prog {-i|--ihex} file.hex [-i file.hex ...] [{-D|--device}=vendor:device] outfile.dfu"""
|
||||
parser = OptionParser(usage=usage)
|
||||
parser.add_option("-b", "--build", action="append", dest="binfiles",
|
||||
help="build a DFU file from given BINFILES. Note that the BINFILES must not have any DFU suffix!", metavar="BINFILES")
|
||||
parser.add_option("-i", "--ihex", action="append", dest="hexfiles",
|
||||
help="build a DFU file from given HEXFILES", metavar="HEXFILES")
|
||||
parser.add_option("-s", "--build-s19", type="string", dest="s19files",
|
||||
help="build a DFU file from given S19 S-record file.", metavar="S19FILE")
|
||||
parser.add_option("-D", "--device", action="store", dest="device",
|
||||
help="build for DEVICE, defaults to %s" % DEFAULT_DEVICE, metavar="DEVICE")
|
||||
parser.add_option("-d", "--dump", action="store_true", dest="dump_images",
|
||||
default=False, help="dump contained images to current directory")
|
||||
(options, args) = parser.parse_args()
|
||||
|
||||
if (options.binfiles or options.hexfiles) and len(args)==1:
|
||||
target = []
|
||||
|
||||
if options.binfiles:
|
||||
for arg in options.binfiles:
|
||||
try:
|
||||
address,binfile = arg.split(':',1)
|
||||
except ValueError:
|
||||
print("Address:file couple '%s' invalid." % arg)
|
||||
sys.exit(1)
|
||||
try:
|
||||
address = int(address,0) & 0xFFFFFFFF
|
||||
except ValueError:
|
||||
print("Address %s invalid." % address)
|
||||
sys.exit(1)
|
||||
if not os.path.isfile(binfile):
|
||||
print("Unreadable file '%s'." % binfile)
|
||||
sys.exit(1)
|
||||
checkbin(binfile)
|
||||
target.append({ 'address': address, 'data': open(binfile,'rb').read() })
|
||||
|
||||
if options.hexfiles:
|
||||
for hex in options.hexfiles:
|
||||
ih = IntelHex(hex)
|
||||
for (address,end) in ih.segments():
|
||||
try:
|
||||
address = address & 0xFFFFFFFF
|
||||
except ValueError:
|
||||
print "Address %s invalid." % address
|
||||
sys.exit(1)
|
||||
target.append({ 'address': address, 'data': ih.tobinstr(start=address, end=end-1)})
|
||||
|
||||
outfile = args[0]
|
||||
device = DEFAULT_DEVICE
|
||||
if options.device:
|
||||
device=options.device
|
||||
try:
|
||||
v,d=[int(x,0) & 0xFFFF for x in device.split(':',1)]
|
||||
except:
|
||||
print("Invalid device '%s'." % device)
|
||||
sys.exit(1)
|
||||
build(outfile,[target],DEFAULT_NAME,device)
|
||||
elif options.s19files and len(args)==1:
|
||||
address = 0
|
||||
data = ""
|
||||
target = []
|
||||
name = DEFAULT_NAME
|
||||
with open(options.s19files) as f:
|
||||
lines = f.readlines()
|
||||
for line in lines:
|
||||
curaddress = 0
|
||||
curdata = ""
|
||||
line = line.rstrip()
|
||||
if line.startswith ( "S0" ):
|
||||
name = binascii.a2b_hex(line[8:len(line) - 2]).replace(".s19", "")
|
||||
elif line.startswith ( "S3" ):
|
||||
try:
|
||||
curaddress = int(line[4:12], 16) & 0xFFFFFFFF
|
||||
except ValueError:
|
||||
print("Address %s invalid." % address)
|
||||
sys.exit(1)
|
||||
curdata = binascii.unhexlify(line[12:-2])
|
||||
elif line.startswith ( "S2" ):
|
||||
try:
|
||||
curaddress = int(line[4:10], 16) & 0xFFFFFFFF
|
||||
except ValueError:
|
||||
print("Address %s invalid." % address)
|
||||
sys.exit(1)
|
||||
curdata = binascii.unhexlify(line[10:-2])
|
||||
elif line.startswith ( "S1" ):
|
||||
try:
|
||||
curaddress = int(line[4:8], 16) & 0xFFFFFFFF
|
||||
except ValueError:
|
||||
print("Address %s invalid." % address)
|
||||
sys.exit(1)
|
||||
curdata = binascii.unhexlify(line[8:-2])
|
||||
if address == 0:
|
||||
address = curaddress
|
||||
data = curdata
|
||||
elif address + len(data) != curaddress:
|
||||
target.append({ 'address': address, 'data': data })
|
||||
address = curaddress
|
||||
data = curdata
|
||||
else:
|
||||
data += curdata
|
||||
outfile = args[0]
|
||||
device = DEFAULT_DEVICE
|
||||
if options.device:
|
||||
device=options.device
|
||||
try:
|
||||
v,d=[int(x,0) & 0xFFFF for x in device.split(':',1)]
|
||||
except:
|
||||
print("Invalid device '%s'." % device)
|
||||
sys.exit(1)
|
||||
build(outfile,[target],name,device)
|
||||
elif len(args)==1:
|
||||
infile = args[0]
|
||||
if not os.path.isfile(infile):
|
||||
print("Unreadable file '%s'." % infile)
|
||||
sys.exit(1)
|
||||
parse(infile, dump_images=options.dump_images)
|
||||
else:
|
||||
parser.print_help()
|
||||
sys.exit(1)
|
||||
Loading…
Reference in New Issue