diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-15 15:18:31 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-15 15:18:31 +0100 |
| commit | 6579d15c58e2b6b051f126ea8b77dd767252aa14 (patch) | |
| tree | cac9f9205db8c28a764ad8282d3a909bf95e8db4 /common | |
| parent | c44bb3a30f5a1332176edce1a91c0e2cf666ee8f (diff) | |
| parent | 19a0f7fa271de0345bb2df90d443c547c41e8037 (diff) | |
| download | blackbird-obmc-uboot-6579d15c58e2b6b051f126ea8b77dd767252aa14.tar.gz blackbird-obmc-uboot-6579d15c58e2b6b051f126ea8b77dd767252aa14.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_led.c | 6 | ||||
| -rw-r--r-- | common/cmd_sata.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/common/cmd_led.c b/common/cmd_led.c index c725f95ac1..84f79fae00 100644 --- a/common/cmd_led.c +++ b/common/cmd_led.c @@ -110,13 +110,15 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (led_commands[i].on) led_commands[i].on(); else - __led_set(led_commands[i].mask, STATUS_LED_ON); + __led_set(led_commands[i].mask, + STATUS_LED_ON); break; case LED_OFF: if (led_commands[i].off) led_commands[i].off(); else - __led_set(led_commands[i].mask, STATUS_LED_OFF); + __led_set(led_commands[i].mask, + STATUS_LED_OFF); break; case LED_TOGGLE: if (led_commands[i].toggle) diff --git a/common/cmd_sata.c b/common/cmd_sata.c index b401bd1024..8d57285d05 100644 --- a/common/cmd_sata.c +++ b/common/cmd_sata.c @@ -196,7 +196,7 @@ static int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) U_BOOT_CMD( sata, 5, 1, do_sata, "SATA sub system", - "sata init - init SATA sub system\n" + "init - init SATA sub system\n" "sata info - show available SATA devices\n" "sata device [dev] - show or set current device\n" "sata part [dev] - print partition table\n" |
