usb: gadget: g_dnl: Sync internal SN variable with env
Since commit 842778a091
("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>
This commit is contained in:
parent
2d3229bea2
commit
de4e4edaff
@ -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;
|
||||
|
@ -72,6 +72,7 @@
|
||||
SILENT_CALLBACK \
|
||||
SPLASHIMAGE_CALLBACK \
|
||||
"stdin:console,stdout:console,stderr:console," \
|
||||
"serial#:serialno," \
|
||||
CONFIG_ENV_CALLBACK_LIST_STATIC
|
||||
|
||||
struct env_clbk_tbl {
|
||||
|
Loading…
Reference in New Issue
Block a user