summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xextra/usb_updater/servo_updater.py7
-rw-r--r--extra/usb_updater/sweetberry.json6
-rw-r--r--setup.py3
3 files changed, 8 insertions, 8 deletions
diff --git a/extra/usb_updater/servo_updater.py b/extra/usb_updater/servo_updater.py
index 18d25130dd..136cfaf820 100755
--- a/extra/usb_updater/servo_updater.py
+++ b/extra/usb_updater/servo_updater.py
@@ -170,10 +170,9 @@ def findfiles(cname, fname):
if not fname:
# If None, try defaults.
dev = None
- if "servo_v4" in cname:
- dev = "servo_v4"
- if "servo_micro" in cname:
- dev = "servo_micro"
+ for default_f in ['servo_v4', 'servo_micro', 'sweetberry']:
+ if default_f in cname:
+ dev = default_f
if os.path.isfile(FIRMWARE_PATH + dev + ".bin"):
fname = FIRMWARE_PATH + dev + ".bin"
elif not os.path.isfile(fname):
diff --git a/extra/usb_updater/sweetberry.json b/extra/usb_updater/sweetberry.json
index 121ca0baf9..6b70d19fad 100644
--- a/extra/usb_updater/sweetberry.json
+++ b/extra/usb_updater/sweetberry.json
@@ -3,12 +3,12 @@
"board": "sweetberry",
"vid": "0x18d1",
"pid": "0x5020",
+ "console": "0",
"Comment on flash": "This is the base address of writeable flash",
"flash": "0x8000000",
"Comment on region format": "name: [baseoffset, length]",
"regions": {
- "RW": ["0x10000", "0x10000"],
- "PSTATE": ["0xc000", "0x4000"],
- "RO": ["0x0000", "0xc000"]
+ "RW": ["0x40000", "0x40000"],
+ "RO": ["0x0000", "0x40000"]
}
}
diff --git a/setup.py b/setup.py
index ddfed2f8c8..cf45267f37 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,8 @@ setup(
},
data_files=[("share/servo_updater/configs",
["extra/usb_updater/servo_v4.json",
- "extra/usb_updater/servo_micro.json"])],
+ "extra/usb_updater/servo_micro.json",
+ "extra/usb_updater/sweetberry.json"])],
description="Servo usb updater.",
)