summaryrefslogtreecommitdiff
path: root/board/servo_micro
diff options
context:
space:
mode:
authorNick Sanders <nsanders@chromium.org>2016-04-06 14:25:45 -0700
committerchrome-bot <chrome-bot@chromium.org>2016-05-26 16:17:26 -0700
commit56ee8aefc33505a7df4e4148001a11ac461907a3 (patch)
tree9aa84b4f26d7396878757bb7ed79bebaa18f59a2 /board/servo_micro
parent5cc3cac589d3e869266c18ed7e538a769496478f (diff)
downloadchrome-ec-56ee8aefc33505a7df4e4148001a11ac461907a3.tar.gz
servo_micro: add programmable serial number
This change provides a console command for setting, and loading a usb serial number from flash. This feature adds CONFIG_USB_SERIALNO, and currently only has a useful implementation when PSTATE is present. BUG=chromium:571477 TEST=serialno set abcdef; serialno load; reboot BRANCH=none Change-Id: I3b24cfa2d52d54118bc3fd54b276e3d95412d245 Signed-off-by: Nick Sanders <nsanders@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/337359 Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'board/servo_micro')
-rw-r--r--board/servo_micro/board.c4
-rw-r--r--board/servo_micro/board.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/board/servo_micro/board.c b/board/servo_micro/board.c
index f22bda4342..5ee94f032b 100644
--- a/board/servo_micro/board.c
+++ b/board/servo_micro/board.c
@@ -154,12 +154,11 @@ USB_STREAM_CONFIG(usart4_usb,
/******************************************************************************
* Define the strings used in our USB descriptors.
*/
-
const void *const usb_strings[] = {
[USB_STR_DESC] = usb_string_desc,
[USB_STR_VENDOR] = USB_STRING_DESC("Google Inc."),
[USB_STR_PRODUCT] = USB_STRING_DESC("Servo Micro"),
- [USB_STR_SERIALNO] = USB_STRING_DESC("1234-a"),
+ [USB_STR_SERIALNO] = 0,
[USB_STR_VERSION] = USB_STRING_DESC(CROS_EC_VERSION32),
[USB_STR_USART4_STREAM_NAME] = USB_STRING_DESC("Servo UART3"),
[USB_STR_CONSOLE_NAME] = USB_STRING_DESC("Servo EC Shell"),
@@ -169,7 +168,6 @@ const void *const usb_strings[] = {
BUILD_ASSERT(ARRAY_SIZE(usb_strings) == USB_STR_COUNT);
-
/******************************************************************************
* Support SPI bridging over USB, this requires usb_spi_board_enable and
* usb_spi_board_disable to be defined to enable and disable the SPI bridge.
diff --git a/board/servo_micro/board.h b/board/servo_micro/board.h
index 48f9368436..7efb2fc3dd 100644
--- a/board/servo_micro/board.h
+++ b/board/servo_micro/board.h
@@ -87,6 +87,9 @@
#include "gpio_signal.h"
+#define CONFIG_USB_SERIALNO
+#define DEFAULT_SERIALNO "Uninitialized"
+
/* USB string indexes */
enum usb_strings {
USB_STR_DESC = 0,