riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

makefiles/tools/cc2538-bsl: use --write-erase to avoid mass erase

Browse Source
This commit is contained in:
Francisco Molina 2020-11-06 16:53:21 +01:00
parent 8f1e2cbe00
commit 6a606e3f21
No known key found for this signature in database
GPG Key ID: 3E94EAC3DBDEEDA8
2 changed files with 144 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
dist/tools/cc2538-bsl/patches/0001-cc2538-bsl-add-W-write-erase-to-write-and-erase.patch vendored Normal file
View File

@ -0,0 +1,141 @@
From bb97c5e6aaaca2f1d667a6ba1c3be0d774aacd8e Mon Sep 17 00:00:00 2001
From: Francisco Molina <femolina@uc.cl>
Date: Thu, 5 Nov 2020 16:44:43 +0100
Subject: [PATCH] cc2538-bsl: add -W,--write-erase to write and erase
-W, --write-erase will erase flash pages where data will be written,
this avoids performing a mass erase.
---
cc2538-bsl.py | 45 ++++++++++++++++++++++++++++++++++++++-------
1 file changed, 38 insertions(+), 7 deletions(-)
diff --git a/cc2538-bsl.py b/cc2538-bsl.py
index efdab3d..506401c 100755
--- a/cc2538-bsl.py
+++ b/cc2538-bsl.py
@@ -42,6 +42,7 @@ from subprocess import Popen, PIPE
import sys
import getopt
import glob
+import math
import time
import os
import struct
@@ -688,6 +689,15 @@ class Chip(object):
self.has_cmd_set_xosc = False
self.page_size = 2048
+
+ def page_align_up(self, value):
+ return int(math.ceil(value / self.page_size) * self.page_size)
+
+
+ def page_align_down(self, value):
+ return int(math.floor(value / self.page_size) * self.page_size)
+
+
def page_to_addr(self, pages):
addresses = []
for page in pages:
@@ -1032,6 +1042,8 @@ def usage():
eg: -E a,0x00000000,0x00001000,
-E p,1,4
-w Write
+ -W, --write-erase Write and erase (Only section to write, rounds
+ up if not page aligned)
-v Verify (CRC32 check)
-r Read
-l length Length of read
@@ -1060,6 +1072,7 @@ if __name__ == "__main__":
'force': 0,
'erase': 0,
'write': 0,
+ 'write_erase': 0,
'erase_page': 0,
'verify': 0,
'read': 0,
@@ -1075,8 +1088,9 @@ if __name__ == "__main__":
try:
opts, args = getopt.getopt(sys.argv[1:],
- "DhqVfeE:wvrp:b:a:l:i:",
- ['help', 'ieee-address=','erase-page=',
+ "DhqVfeE:wWvrp:b:a:l:i:",
+ ['help', 'ieee-address=','write-erase=',
+ 'erase-page=',
'disable-bootloader',
'bootloader-active-high',
'bootloader-invert-lines', 'version'])
@@ -1100,6 +1114,8 @@ if __name__ == "__main__":
conf['erase'] = 1
elif o == '-w':
conf['write'] = 1
+ elif o == '-W' or o == '--write-erase':
+ conf['write_erase'] = 1
elif o == '-E' or o == '--erase-page':
conf['erase_page'] = str(a)
elif o == '-v':
@@ -1132,25 +1148,27 @@ if __name__ == "__main__":
try:
# Sanity checks
# check for input/output file
- if conf['write'] or conf['read'] or conf['verify']:
+ if conf['write'] or conf['write_erase'] or conf['read'] or conf['verify']:
try:
args[0]
except:
raise Exception('No file path given.')
- if conf['write'] and conf['read']:
+ if (conf['write'] and conf['read']) or (conf['write_erase'] and conf['read']):
if not (conf['force'] or
query_yes_no("You are reading and writing to the same "
"file. This will overwrite your input file. "
"Do you want to continue?", "no")):
raise Exception('Aborted by user.')
- if (conf['erase'] and conf['read']) or (conf['erase_page'] and conf['read']) and not conf['write']:
+ if ((conf['erase'] and conf['read']) or (conf['erase_page'] and conf['read'])
+ and not (conf['write'] or conf['write_erase'])):
if not (conf['force'] or
query_yes_no("You are about to erase your target before "
"reading. Do you want to continue?", "no")):
raise Exception('Aborted by user.')
- if conf['read'] and not conf['write'] and conf['verify']:
+ if (conf['read'] and not (conf['write'] or conf['write_erase'])
+ and conf['verify']):
raise Exception('Verify after read not implemented.')
if conf['len'] < 0:
@@ -1183,7 +1201,7 @@ if __name__ == "__main__":
conf['bootloader_invert_lines'])
mdebug(5, "Opening port %(port)s, baud %(baud)d"
% {'port': conf['port'], 'baud': conf['baud']})
- if conf['write'] or conf['verify']:
+ if conf['write'] or conf['write_erase'] or conf['verify']:
mdebug(5, "Reading data from %s" % args[0])
firmware = FirmwareFile(args[0])
@@ -1249,6 +1267,19 @@ if __name__ == "__main__":
else:
raise CmdException("Write failed ")
+ if conf['write_erase']:
+ # TODO: check if boot loader back-door is open, need to read
+ # flash size first to get address
+ # Round up to ensure page alignment
+ erase_len = device.page_align_up(len(firmware.bytes))
+ erase_len = min(erase_len, device.size)
+ if cmd.cmdEraseMemory(conf['address'], erase_len):
+ mdebug(5, " Erase before write done ")
+ if cmd.writeMemory(conf['address'], firmware.bytes):
+ mdebug(5, " Write done ")
+ else:
+ raise CmdException("Write failed ")
+
if conf['verify']:
mdebug(5, "Verifying by comparing CRC32 calculations.")
--
2.28.0

4
makefiles/tools/cc2538-bsl.inc.mk
View File

@ -2,7 +2,9 @@ FLASHFILE ?= $(BINFILE)
FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
FFLAGS_OPTS ?=
PROG_BAUD ?= 500000 # default value in cc2538-bsl
FFLAGS = -p "$(PROG_DEV)" $(FFLAGS_OPTS) -e -w -v -b $(PROG_BAUD) $(FLASHFILE)
FFLAGS = $(if $(IMAGE_OFFSET), -a $(shell printf "0x%08x" $$(($(IMAGE_OFFSET) + $(ROM_START_ADDR)))))
FFLAGS += -p "$(PROG_DEV)" $(FFLAGS_OPTS) --write-erase -v -b $(PROG_BAUD) $(FLASHFILE)
RESET ?= $(FLASHER) -p "$(PROG_DEV)" $(FFLAGS_OPTS) -b $(PROG_BAUD)