diff options
| author | Ruben Rodriguez Buchillon <coconutruben@chromium.org> | 2018-12-10 17:21:19 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-01-03 15:04:45 -0800 |
| commit | 0d8358a854797867564bc4032dbe3296c3b040e4 (patch) | |
| tree | dd8dd4a3fd5ea1003c28a307bfce981b53dd2023 /extra | |
| parent | b53abd8e57bcd4c643ce31822be176d8e364a0d9 (diff) | |
| download | chrome-ec-0d8358a854797867564bc4032dbe3296c3b040e4.tar.gz | |
servo_updater: include sweetberry into servo_updater logic
This change allows for sweetberry to be a valid configuration for
servo_updater
BRANCH=None
BUG=b:120449224
TEST=manual testing
sudo servod_updater --board sweetberry
...
...
update complete
image updated
Change-Id: If6a9113beb89ae8b58c70e959a77c9bb9f00607d
Signed-off-by: Ruben Rodriguez Buchillon <coconutruben@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1369506
Reviewed-by: Nick Sanders <nsanders@chromium.org>
Diffstat (limited to 'extra')
| -rwxr-xr-x | extra/usb_updater/servo_updater.py | 7 | ||||
| -rw-r--r-- | extra/usb_updater/sweetberry.json | 6 |
2 files changed, 6 insertions, 7 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"] } } |