summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian J. Nemec <bnemec@chromium.org>2020-05-27 22:18:09 -0700
committerRuben Rodriguez Buchillon <coconutruben@chromium.org>2020-06-02 17:24:42 +0000
commitdba753130cd341c047afd652ab28a2b099dde9ee (patch)
tree02957d13c2bb810706e2877ca343f9ee0f57b488
parent785f968014cac6ed6f77e09a379beb78c12dc5ff (diff)
downloadchrome-ec-dba753130cd341c047afd652ab28a2b099dde9ee.tar.gz
servo_updater: Updates the Servo V4.1 name
Updates the Servo V4.1 name from 'servo_v41' to 'servo_v4p1' and the corresponding files and fields. As the VID:PID is used to identify the device, no other changes are required. BUG=b:157059356 BRANCH=servod TEST=Updated the ServoV4.1 from 'servo_v41_v2.0.3735+440cf71e0' to 'servo_v4p1_v2.0.4232-514cb4e92' to verify the servo_updater supports renames. TEST=Verified servo_v4p1 manually: Validated console, firmware update, and servod can connect to the device. Signed-off-by: Brian Nemec <bnemec@chromium.org> Depends-On: Ia05134179fab4ff118355ba9b3b1b92cdf0748f2 Change-Id: Ie470469bf9115bbfef14a08c02b156dcd5aed849 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2219124 Tested-by: Brian Nemec <bnemec@chromium.org> Reviewed-by: Ruben Rodriguez Buchillon <coconutruben@chromium.org>
-rwxr-xr-xextra/usb_updater/servo_updater.py2
-rw-r--r--extra/usb_updater/servo_v4p1.json (renamed from extra/usb_updater/servo_v41.json)2
-rw-r--r--setup.py2
-rwxr-xr-xutil/flash_ec2
4 files changed, 5 insertions, 3 deletions
diff --git a/extra/usb_updater/servo_updater.py b/extra/usb_updater/servo_updater.py
index 20f0245f77..f899e158bc 100755
--- a/extra/usb_updater/servo_updater.py
+++ b/extra/usb_updater/servo_updater.py
@@ -24,7 +24,9 @@ class ServoUpdaterException(Exception):
BOARD_C2D2 = 'c2d2'
BOARD_SERVO_MICRO = 'servo_micro'
BOARD_SERVO_V4 = 'servo_v4'
+BOARD_SERVO_V4P1 = 'servo_v4p1'
BOARD_SWEETBERRY = 'sweetberry'
+
DEFAULT_BOARD = BOARD_SERVO_V4
DEFAULT_BASE_PATH = '/usr/'
diff --git a/extra/usb_updater/servo_v41.json b/extra/usb_updater/servo_v4p1.json
index 6a5b367450..46efbf24ad 100644
--- a/extra/usb_updater/servo_v41.json
+++ b/extra/usb_updater/servo_v4p1.json
@@ -1,6 +1,6 @@
{
"Comment": "This file describes the updateable sections of the flash.",
- "board": "servo_v41",
+ "board": "servo_v4p1",
"vid": "0x18d1",
"pid": "0x520d",
"console": "0",
diff --git a/setup.py b/setup.py
index df1b6fb4e7..fc6c5d396b 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@ setup(
data_files=[("share/servo_updater/configs",
["extra/usb_updater/c2d2.json",
"extra/usb_updater/servo_v4.json",
- "extra/usb_updater/servo_v41.json",
+ "extra/usb_updater/servo_v4p1.json",
"extra/usb_updater/servo_micro.json",
"extra/usb_updater/sweetberry.json"])],
description="Servo usb updater.",
diff --git a/util/flash_ec b/util/flash_ec
index ab7aa8d0d2..087ba637eb 100755
--- a/util/flash_ec
+++ b/util/flash_ec
@@ -100,7 +100,7 @@ BOARDS_STM32_DFU=(
twinkie
discovery
servo_v4
- servo_v41
+ servo_v4p1
servo_micro
sweetberry
polyberry