Skip to content

Commit dba7531

Browse files
bnemec-chromiumcoconutruben
authored andcommitted
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 <[email protected]> Depends-On: Ia05134179fab4ff118355ba9b3b1b92cdf0748f2 Change-Id: Ie470469bf9115bbfef14a08c02b156dcd5aed849 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2219124 Tested-by: Brian Nemec <[email protected]> Reviewed-by: Ruben Rodriguez Buchillon <[email protected]>
1 parent 785f968 commit dba7531

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

extra/usb_updater/servo_updater.py

+2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ class ServoUpdaterException(Exception):
2424
BOARD_C2D2 = 'c2d2'
2525
BOARD_SERVO_MICRO = 'servo_micro'
2626
BOARD_SERVO_V4 = 'servo_v4'
27+
BOARD_SERVO_V4P1 = 'servo_v4p1'
2728
BOARD_SWEETBERRY = 'sweetberry'
29+
2830
DEFAULT_BOARD = BOARD_SERVO_V4
2931

3032
DEFAULT_BASE_PATH = '/usr/'

extra/usb_updater/servo_v41.json extra/usb_updater/servo_v4p1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Comment": "This file describes the updateable sections of the flash.",
3-
"board": "servo_v41",
3+
"board": "servo_v4p1",
44
"vid": "0x18d1",
55
"pid": "0x520d",
66
"console": "0",

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
data_files=[("share/servo_updater/configs",
4242
["extra/usb_updater/c2d2.json",
4343
"extra/usb_updater/servo_v4.json",
44-
"extra/usb_updater/servo_v41.json",
44+
"extra/usb_updater/servo_v4p1.json",
4545
"extra/usb_updater/servo_micro.json",
4646
"extra/usb_updater/sweetberry.json"])],
4747
description="Servo usb updater.",

util/flash_ec

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ BOARDS_STM32_DFU=(
100100
twinkie
101101
discovery
102102
servo_v4
103-
servo_v41
103+
servo_v4p1
104104
servo_micro
105105
sweetberry
106106
polyberry

0 commit comments

Comments
 (0)