diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-22 09:49:21 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-22 09:49:21 +0100 |
| commit | 5ebdae4863f64a32826c25c6e0d1dfbc1612d904 (patch) | |
| tree | f7c8ae79050fd00a708bfcda11f6681ebb9a32ce /commands | |
| parent | 034637fbd9dfc5cbcffca1f8f392c6ab0dd6f229 (diff) | |
| parent | 2f9b25f41362e99e2b31684b5c9a1a02abc1ae8b (diff) | |
| download | barebox-5ebdae4863f64a32826c25c6e0d1dfbc1612d904.tar.gz barebox-5ebdae4863f64a32826c25c6e0d1dfbc1612d904.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/mmc_extcsd.c | 2 | ||||
| -rw-r--r-- | commands/usbgadget.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/commands/mmc_extcsd.c b/commands/mmc_extcsd.c index 7a6d39075d..acd23a466b 100644 --- a/commands/mmc_extcsd.c +++ b/commands/mmc_extcsd.c @@ -2357,7 +2357,7 @@ static void write_field(struct mci *mci, u8 *reg, u16 index, u8 value, break; } - mci_switch(mci, 0, index, value); + mci_switch(mci, index, value); out: return; diff --git a/commands/usbgadget.c b/commands/usbgadget.c index 507871edd2..a1744cbe13 100644 --- a/commands/usbgadget.c +++ b/commands/usbgadget.c @@ -119,13 +119,13 @@ BAREBOX_CMD_HELP_START(usbgadget) BAREBOX_CMD_HELP_TEXT("Enable / disable a USB composite gadget on the USB device interface.") BAREBOX_CMD_HELP_TEXT("") BAREBOX_CMD_HELP_TEXT("Options:") -BAREBOX_CMD_HELP_OPT ("-a", "Create CDC ACM function") -BAREBOX_CMD_HELP_OPT ("-s", "Create Generic Serial function") -BAREBOX_CMD_HELP_OPT ("-A [desc]", "Create Android Fastboot function. If 'desc' is not provided,") -BAREBOX_CMD_HELP_OPT ("", "trying to use 'global.usbgadget.fastboot_function' variable.") -BAREBOX_CMD_HELP_OPT ("-b", "include registered barebox update handlers (fastboot specific)") -BAREBOX_CMD_HELP_OPT ("-D <desc>", "Create DFU function") -BAREBOX_CMD_HELP_OPT ("-d", "Disable the currently running gadget") +BAREBOX_CMD_HELP_OPT ("-a\t", "Create CDC ACM function") +BAREBOX_CMD_HELP_OPT ("-s\t", "Create Generic Serial function") +BAREBOX_CMD_HELP_OPT ("-A <desc>", "Create Android Fastboot function. If 'desc' is not provided, " + "try to use 'global.usbgadget.fastboot_function' variable.") +BAREBOX_CMD_HELP_OPT ("-b\t", "include registered barebox update handlers (fastboot specific)") +BAREBOX_CMD_HELP_OPT ("-D <desc>", "Create DFU function") +BAREBOX_CMD_HELP_OPT ("-d\t", "Disable the currently running gadget") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(usbgadget) |