summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget
diff options
context:
space:
mode:
authorSam Protsenko <semen.protsenko@linaro.org>2017-09-01 15:42:03 +0300
committerTom Rini <trini@konsulko.com>2017-09-05 20:17:08 -0400
commitde4e4edaffeeb56aeb9354662872cbbcaf46d4cd (patch)
tree0f466775da00356b363cb572c7b0a10e7a2c018d /drivers/usb/gadget
parent2d3229bea240a26516e70257e26757d0ec0d98f1 (diff)
usb: gadget: g_dnl: Sync internal SN variable with env
Since commit 842778a09104 ("usb: gadget: g_dnl: only set iSerialNumber if we have a serial#") "fastboot devices" stopped to show correct device serial number for TI boards, showing this line instead: ???????????? fastboot This is because serial# env variable could be set after g_dnl gadget was initialized (e.g. by using env_set() in the board file). To fix this, let's update internal serial number variable (g_dnl_serial) when "serial#" env var is changed. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Cc: Felipe Balbi <felipe.balbi@linux.intel.com> Tested-by: Heiko Schocher <hs@denx.de> Acked-by: Ɓukasz Majewski <lukma@denx.de> Reviewed-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r--drivers/usb/gadget/g_dnl.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index 0491a0eea9..039331a5af 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -19,6 +19,8 @@
#include <dfu.h>
#include <thor.h>
+#include <env_callback.h>
+
#include "gadget_chips.h"
#include "composite.c"
@@ -202,6 +204,19 @@ static int g_dnl_get_bcd_device_number(struct usb_composite_dev *cdev)
return g_dnl_get_board_bcd_device_number(gcnum);
}
+/**
+ * Update internal serial number variable when the "serial#" env var changes.
+ *
+ * Handle all cases, even when flags == H_PROGRAMMATIC or op == env_op_delete.
+ */
+static int on_serialno(const char *name, const char *value, enum env_op op,
+ int flags)
+{
+ g_dnl_set_serialnumber((char *)value);
+ return 0;
+}
+U_BOOT_ENV_CALLBACK(serialno, on_serialno);
+
static int g_dnl_bind(struct usb_composite_dev *cdev)
{
struct usb_gadget *gadget = cdev->gadget;