diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-14 16:12:31 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-16 08:40:37 +0200 |
| commit | b986f4f1ee4881c4c1d81738cf9f0366381f7066 (patch) | |
| tree | ec9333b46094e958ec5bc1bfbfd43c19e59de959 /commands | |
| parent | 8326bff00fd2a3aaa5f45a0c3de35a76ab767c83 (diff) | |
| download | barebox-b986f4f1ee4881c4c1d81738cf9f0366381f7066.tar.gz barebox-b986f4f1ee4881c4c1d81738cf9f0366381f7066.tar.xz | |
remove remaining references of CONFIG_BOARDINFO
With this all code uses barebox_get_model() and no longer
a compile time generated string.
Also this renames barebox_boardinfo() to barebox_get_model()
since we are going to add the corresponding _set_ function
and 'model' corresponds to the devicetree notion.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/dfu.c | 4 | ||||
| -rw-r--r-- | commands/usbserial.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/commands/dfu.c b/commands/dfu.c index af6573acf8..ec1197a888 100644 --- a/commands/dfu.c +++ b/commands/dfu.c @@ -99,7 +99,7 @@ static int do_dfu(int argc, char *argv[]) char *endptr, *argstr; struct usb_dfu_dev *dfu_alts = NULL; char *manufacturer = "barebox"; - char *productname = CONFIG_BOARDINFO; + const char *productname = barebox_get_model(); u16 idVendor = 0, idProduct = 0; @@ -163,7 +163,7 @@ BAREBOX_CMD_HELP_START(dfu) BAREBOX_CMD_HELP_USAGE("dfu [OPTIONS] <description>\n") BAREBOX_CMD_HELP_SHORT("Start firmware update with the Device Firmware Update (DFU) protocol.\n") BAREBOX_CMD_HELP_OPT ("-m <str>", "Manufacturer string (barebox)\n") -BAREBOX_CMD_HELP_OPT ("-p <str>", "product string (" CONFIG_BOARDINFO ")\n") +BAREBOX_CMD_HELP_OPT ("-p <str>", "product string\n") BAREBOX_CMD_HELP_OPT ("-V <id>", "vendor id\n") BAREBOX_CMD_HELP_OPT ("-P <id>", "product id\n") BAREBOX_CMD_HELP_OPT ("<description>", diff --git a/commands/usbserial.c b/commands/usbserial.c index a884a28d27..bd5067f7a4 100644 --- a/commands/usbserial.c +++ b/commands/usbserial.c @@ -33,7 +33,7 @@ static int do_usbserial(int argc, char *argv[]) struct usb_serial_pdata pdata; char *argstr; char *manufacturer = "barebox"; - char *productname = CONFIG_BOARDINFO; + const char *productname = barebox_get_model(); u16 idVendor = 0, idProduct = 0; int mode = 0; @@ -83,7 +83,7 @@ BAREBOX_CMD_HELP_START(usbserial) BAREBOX_CMD_HELP_USAGE("usbserial [OPTIONS] <description>\n") BAREBOX_CMD_HELP_SHORT("Enable/disable a serial gadget on the USB device interface.\n") BAREBOX_CMD_HELP_OPT ("-m <str>", "Manufacturer string (barebox)\n") -BAREBOX_CMD_HELP_OPT ("-p <str>", "product string (" CONFIG_BOARDINFO ")\n") +BAREBOX_CMD_HELP_OPT ("-p <str>", "product string\n") BAREBOX_CMD_HELP_OPT ("-V <id>", "vendor id\n") BAREBOX_CMD_HELP_OPT ("-P <id>", "product id\n") BAREBOX_CMD_HELP_OPT ("-a", "CDC ACM (default)\n") |