projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://www.denx.de/git/u-boot
[oweals/u-boot.git]
/
board
/
trab
/
cmd_trab.c
diff --git
a/board/trab/cmd_trab.c
b/board/trab/cmd_trab.c
index b82c8edef70d205fee248c1814476bacd0aa93ec..daa6aeefc73f5a6b0bc8d3b974ea8fca07416e49 100644
(file)
--- a/
board/trab/cmd_trab.c
+++ b/
board/trab/cmd_trab.c
@@
-32,7
+32,7
@@
* TRAB board specific commands. Especially commands for burn-in and function
* test.
*/
* TRAB board specific commands. Especially commands for burn-in and function
* test.
*/
-#if
(CONFIG_COMMANDS & CF
G_CMD_BSP)
+#if
defined(CONFI
G_CMD_BSP)
/* limits for valid range of VCC5V in mV */
#define VCC5V_MIN 4500
/* limits for valid range of VCC5V in mV */
#define VCC5V_MIN 4500
@@
-846,7
+846,7
@@
int do_temp_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
int contact_temp;
int delay = 0;
{
int contact_temp;
int delay = 0;
-#if
(CONFIG_COMMANDS & CF
G_CMD_DATE)
+#if
defined(CONFI
G_CMD_DATE)
struct rtc_time tm;
#endif
struct rtc_time tm;
#endif
@@
-862,7
+862,7
@@
int do_temp_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
spi_init ();
while (1) {
spi_init ();
while (1) {
-#if
(CONFIG_COMMANDS & CF
G_CMD_DATE)
+#if
defined(CONFI
G_CMD_DATE)
rtc_get (&tm);
printf ("%4d-%02d-%02d %2d:%02d:%02d - ",
tm.tm_year, tm.tm_mon, tm.tm_mday,
rtc_get (&tm);
printf ("%4d-%02d-%02d %2d:%02d:%02d - ",
tm.tm_year, tm.tm_mon, tm.tm_mday,
@@
-893,4
+893,4
@@
U_BOOT_CMD(
" For each measurment a timestamp is printeted\n"
);
" For each measurment a timestamp is printeted\n"
);
-#endif
/* CFG_CMD_BSP */
+#endif