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>

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):

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"]
   }
 }

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.",
 )