diff options
author | Wolfgang Denk <wd@denx.de> | 2009-07-07 22:35:02 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-07-07 22:35:02 +0200 |
commit | 8e5e9b940cdede0debe528cdd7edccccbb3ebf2a (patch) | |
tree | 61647a9af02a1bdb5e498ed467d4eccdb8e706b7 /board | |
parent | a48ecc969f8d2d0fe9167962e9b8b4cca52de10b (diff) | |
download | u-boot-imx-8e5e9b940cdede0debe528cdd7edccccbb3ebf2a.zip u-boot-imx-8e5e9b940cdede0debe528cdd7edccccbb3ebf2a.tar.gz u-boot-imx-8e5e9b940cdede0debe528cdd7edccccbb3ebf2a.tar.bz2 |
Coding style cleanup; update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board')
-rw-r--r-- | board/digsy_mtc/cmd_mtc.c | 30 | ||||
-rw-r--r-- | board/esd/dp405/dp405.c | 44 |
2 files changed, 37 insertions, 37 deletions
diff --git a/board/digsy_mtc/cmd_mtc.c b/board/digsy_mtc/cmd_mtc.c index 9e377cd..2ecb4f8 100644 --- a/board/digsy_mtc/cmd_mtc.c +++ b/board/digsy_mtc/cmd_mtc.c @@ -333,18 +333,18 @@ int cmd_mtc(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } U_BOOT_CMD(mtc, 5, 1, cmd_mtc, - "mtc - special commands for digsyMTC\n", - "[subcommand] [args...]\n" - "Subcommands list:\n" - "led [ledname] [state] [blink] - set state of leds\n" - " [ledname]: diag can1 can2 can3 can4 usbpwr usbbusy user1 user2\n" - " [state]: off red green orange\n" - " [blink]: blink interval in 100ms steps (1 - 10; 0 = static)\n" - "key - returns state of user key\n" - "version - returns firmware version of supervisor uC\n" - "appreg - reads appreg value and stores in environment variable" - " 'appreg'\n" - "digin [channel] - returns state of digital input (1 or 2)\n" - "digout <on|off> <on|off> - sets state of two digital outputs\n" - "help [subcommand] - get help for subcommand\n"); - + "mtc - special commands for digsyMTC\n", + "[subcommand] [args...]\n" + "Subcommands list:\n" + "led [ledname] [state] [blink] - set state of leds\n" + " [ledname]: diag can1 can2 can3 can4 usbpwr usbbusy user1 user2\n" + " [state]: off red green orange\n" + " [blink]: blink interval in 100ms steps (1 - 10; 0 = static)\n" + "key - returns state of user key\n" + "version - returns firmware version of supervisor uC\n" + "appreg - reads appreg value and stores in environment variable" + " 'appreg'\n" + "digin [channel] - returns state of digital input (1 or 2)\n" + "digout <on|off> <on|off> - sets state of two digital outputs\n" + "help [subcommand] - get help for subcommand\n" +); diff --git a/board/esd/dp405/dp405.c b/board/esd/dp405/dp405.c index 8f4b78d..e52d37b 100644 --- a/board/esd/dp405/dp405.c +++ b/board/esd/dp405/dp405.c @@ -101,28 +101,28 @@ int checkboard (void) id1 = trans[(~(in_be32((void *)GPIO0_IR) >> 5)) & 0x0000000f]; id2 = trans[(~(in_be32((void *)GPIO0_IR) >> 9)) & 0x0000000f]; - rev = in_8((void *)0xf0001000); - if (rev & 0x10) /* old DP405 compatibility */ - rev = in_8((void *)0xf0000800); - - switch (rev & 0xc0) { - case 0x00: - puts(" (HW=DP405"); - break; - case 0x80: - puts(" (HW=DP405/CO"); - break; - case 0xc0: - puts(" (HW=DN405"); - break; - } - printf(", ID=0x%1X%1X, PLD=0x%02X", id2, id1, rev & 0x0f); - - if ((rev & 0xc0) == 0xc0) { - printf(", C5V=%s", - in_be32((void *)GPIO0_IR) & 0x40000000 ? "off" : "on"); - } - puts(")\n"); + rev = in_8((void *)0xf0001000); + if (rev & 0x10) /* old DP405 compatibility */ + rev = in_8((void *)0xf0000800); + + switch (rev & 0xc0) { + case 0x00: + puts(" (HW=DP405"); + break; + case 0x80: + puts(" (HW=DP405/CO"); + break; + case 0xc0: + puts(" (HW=DN405"); + break; + } + printf(", ID=0x%1X%1X, PLD=0x%02X", id2, id1, rev & 0x0f); + + if ((rev & 0xc0) == 0xc0) { + printf(", C5V=%s", + in_be32((void *)GPIO0_IR) & 0x40000000 ? "off" : "on"); + } + puts(")\n"); return 0; } |